From 407db66d5c35441dd73a8bfc01ee4fbb6ecf245f Mon Sep 17 00:00:00 2001 From: Hat Kid <6624576+Hat-Kid@users.noreply.github.com> Date: Sat, 7 Dec 2024 16:43:55 +0100 Subject: [PATCH] jak2 ref --- .../jak2/engine/camera/cam-debug_REF.gc | 8 +-- .../jak2/engine/camera/cam-layout_REF.gc | 2 +- .../jak2/engine/camera/cam-master_REF.gc | 4 +- .../jak2/engine/camera/cam-states-dbg_REF.gc | 48 +++++++------- .../jak2/engine/camera/cam-states_REF.gc | 4 +- .../jak2/engine/camera/camera_REF.gc | 18 +++--- .../jak2/engine/collide/collide-touch_REF.gc | 2 +- .../engine/common_objs/blocking-plane_REF.gc | 8 +-- .../engine/common_objs/collectables_REF.gc | 8 +-- .../jak2/engine/common_objs/crates_REF.gc | 4 +- .../engine/common_objs/dark-eco-pool_REF.gc | 2 +- .../jak2/engine/common_objs/water_REF.gc | 26 ++++---- .../jak2/engine/debug/default-menu_REF.gc | 30 ++++----- .../jak2/engine/debug/editable-player_REF.gc | 6 +- .../jak2/engine/debug/editable_REF.gc | 2 +- .../engine/debug/nav/nav-graph-editor_REF.gc | 2 +- .../jak2/engine/draw/drawable_REF.gc | 2 +- .../jak2/engine/game/effect-control_REF.gc | 2 +- .../jak2/engine/geometry/cylinder_REF.gc | 4 +- .../jak2/engine/geometry/geometry_REF.gc | 12 ++-- .../jak2/engine/gfx/foreground/ripple_REF.gc | 2 +- .../reference/jak2/engine/gfx/hw/video_REF.gc | 2 +- .../jak2/engine/gfx/math-camera_REF.gc | 2 +- .../jak2/engine/gfx/mood/mood-funcs2_REF.gc | 18 +++--- .../jak2/engine/gfx/mood/mood-funcs_REF.gc | 14 ++--- .../jak2/engine/gfx/mood/mood-tables2_REF.gc | 4 +- .../jak2/engine/gfx/mood/mood_REF.gc | 8 +-- .../jak2/engine/gfx/mood/time-of-day_REF.gc | 12 ++-- .../jak2/engine/gfx/ocean/ocean-mid_REF.gc | 4 +- .../jak2/engine/gfx/ocean/ocean-near_REF.gc | 4 +- .../engine/gfx/ocean/ocean-texture_REF.gc | 6 +- .../jak2/engine/gfx/ocean/ocean_REF.gc | 22 +++---- .../jak2/engine/gfx/sky/sky-tng_REF.gc | 6 +- .../gfx/sprite/particles/sparticle_REF.gc | 4 +- .../engine/gfx/sprite/sprite-distort_REF.gc | 10 +-- .../jak2/engine/gfx/sprite/sprite-glow_REF.gc | 2 +- .../reference/jak2/engine/math/math_REF.gc | 14 ++--- .../jak2/engine/math/quaternion_REF.gc | 8 +-- .../jak2/engine/math/transformq_REF.gc | 2 +- .../jak2/engine/physics/dynamics-h_REF.gc | 6 +- .../jak2/engine/physics/rigid-body_REF.gc | 4 +- .../jak2/engine/physics/trajectory_REF.gc | 4 +- .../reference/jak2/engine/ps2/timer_REF.gc | 4 +- .../reference/jak2/engine/scene/scene_REF.gc | 4 +- .../reference/jak2/engine/sound/gsound_REF.gc | 8 +-- .../engine/target/board/board-states_REF.gc | 12 ++-- .../engine/target/board/target-board_REF.gc | 14 ++--- .../target/collide-reaction-target_REF.gc | 2 +- .../engine/target/gun/gun-yellow-shot_REF.gc | 2 +- .../jak2/engine/target/logic-target_REF.gc | 2 +- .../jak2/engine/target/mech/mech-part_REF.gc | 2 +- .../engine/target/mech/mech-states_REF.gc | 6 +- .../jak2/engine/target/surface-h_REF.gc | 6 +- .../jak2/engine/target/target-anim_REF.gc | 8 +-- .../jak2/engine/target/target-carry_REF.gc | 2 +- .../jak2/engine/target/target-darkjak_REF.gc | 6 +- .../jak2/engine/target/target-death_REF.gc | 2 +- .../jak2/engine/target/target-gun_REF.gc | 4 +- .../jak2/engine/target/target-swim_REF.gc | 4 +- .../jak2/engine/target/target-tube_REF.gc | 2 +- .../engine/target/target-turret-shot_REF.gc | 2 +- .../jak2/engine/target/target-turret_REF.gc | 2 +- .../jak2/engine/target/target-util_REF.gc | 10 +-- .../jak2/engine/target/target2_REF.gc | 2 +- .../jak2/engine/target/target_REF.gc | 8 +-- .../reference/jak2/engine/ui/bigmap_REF.gc | 4 +- .../reference/jak2/engine/ui/hud_REF.gc | 6 +- .../reference/jak2/engine/ui/minimap_REF.gc | 26 ++++---- .../engine/ui/progress/progress-draw_REF.gc | 2 +- .../jak2/engine/ui/progress/progress_REF.gc | 62 +++++++++---------- .../reference/jak2/engine/ui/text_REF.gc | 2 +- .../jak2/engine/util/smush-control-h_REF.gc | 2 +- .../jak2/engine/util/sync-info_REF.gc | 6 +- .../reference/jak2/kernel/gstring_REF.gc | 2 +- .../jak2/levels/atoll/atoll-obs_REF.gc | 4 +- .../levels/castle/boss/casboss-texture_REF.gc | 4 +- .../levels/castle/boss/castle-baron_REF.gc | 2 +- .../jak2/levels/castle/castle-texture_REF.gc | 2 +- .../jak2/levels/castle/roboguard-level_REF.gc | 6 +- .../jak2/levels/city/bombbot/bombbot_REF.gc | 4 +- .../jak2/levels/city/common/nav-graph_REF.gc | 6 +- .../jak2/levels/city/common/trail_REF.gc | 2 +- .../jak2/levels/city/ctywide-obs_REF.gc | 14 ++--- .../levels/city/onintent/onin-game_REF.gc | 10 +-- .../jak2/levels/city/palace/ctypal-obs_REF.gc | 6 +- .../levels/city/slums/kor/kid3-course_REF.gc | 2 +- .../levels/city/slums/kor/kor3-course_REF.gc | 2 +- .../city/traffic/citizen/citizen-norm_REF.gc | 2 +- .../city/traffic/citizen/citizen_REF.gc | 2 +- .../city/traffic/citizen/civilian_REF.gc | 2 +- .../levels/city/traffic/citizen/guard_REF.gc | 6 +- .../traffic/citizen/metalhead-flitter_REF.gc | 2 +- .../traffic/citizen/metalhead-predator_REF.gc | 2 +- .../levels/city/traffic/traffic-engine_REF.gc | 7 +-- .../levels/city/traffic/vehicle/bike_REF.gc | 16 ++--- .../levels/city/traffic/vehicle/car_REF.gc | 8 +-- .../traffic/vehicle/vehicle-effects_REF.gc | 12 ++-- .../city/traffic/vehicle/vehicle-guard_REF.gc | 2 +- .../traffic/vehicle/vehicle-physics_REF.gc | 8 +-- .../city/traffic/vehicle/vehicle-util_REF.gc | 2 +- .../city/traffic/vehicle/vehicle_REF.gc | 6 +- .../levels/common/ai/sig/sig-plasma_REF.gc | 2 +- .../levels/common/ai/sig/sig-states_REF.gc | 10 +-- .../jak2/levels/common/ai/sig/sig_REF.gc | 6 +- .../jak2/levels/common/elec-gate_REF.gc | 2 +- .../jak2/levels/common/enemy/centurion_REF.gc | 2 +- .../jak2/levels/common/enemy/flitter_REF.gc | 2 +- .../enemy/hover/crimson-guard-hover_REF.gc | 8 +-- .../enemy/hover/hover-nav-control_REF.gc | 2 +- .../common/enemy/hover/hover-nav-edit_REF.gc | 2 +- .../levels/common/enemy/hover/wasp_REF.gc | 6 +- .../jak2/levels/common/enemy/spyder_REF.gc | 2 +- .../levels/common/entities/gun-buoy_REF.gc | 6 +- .../levels/common/entities/spydroid_REF.gc | 8 +-- .../levels/common/guard-projectile_REF.gc | 2 +- .../levels/common/metalhead-projectile_REF.gc | 2 +- .../levels/common/race/race-manager_REF.gc | 6 +- .../jak2/levels/common/race/race-mesh_REF.gc | 4 +- .../jak2/levels/consite/consite-scenes_REF.gc | 2 +- .../jak2/levels/dig/dig-digger_REF.gc | 2 +- .../reference/jak2/levels/dig/dig3-obs_REF.gc | 8 +-- .../jak2/levels/drill/drill-baron_REF.gc | 14 ++--- .../jak2/levels/drill/drill-obs_REF.gc | 18 +++--- .../reference/jak2/levels/drill/ginsu_REF.gc | 2 +- .../jak2/levels/forest/forest-obs_REF.gc | 2 +- .../jak2/levels/forest/pegasus_REF.gc | 2 +- .../jak2/levels/forest/predator_REF.gc | 2 +- .../reference/jak2/levels/forest/wren_REF.gc | 2 +- .../fortress/dump/fort-robotank-turret_REF.gc | 12 ++-- .../levels/fortress/dump/fort-robotank_REF.gc | 4 +- .../fortress/rescue/forrescb-obs_REF.gc | 4 +- .../jak2/levels/intro/intro-scenes_REF.gc | 4 +- .../jak2/levels/mountain/mountain-obs_REF.gc | 30 ++++----- .../jak2/levels/mountain/rhino_REF.gc | 2 +- .../levels/nest/boss/metalkor-extras_REF.gc | 10 +-- .../levels/nest/boss/metalkor-states_REF.gc | 8 +-- .../jak2/levels/nest/boss/nestb-scenes_REF.gc | 2 +- .../levels/palace/boss/squid-setup_REF.gc | 2 +- .../levels/palace/boss/squid-states_REF.gc | 2 +- .../levels/palace/cable/palcab-obs_REF.gc | 4 +- .../palace/throne/metalkor-texture_REF.gc | 4 +- .../jak2/levels/ruins/mechtest-obs_REF.gc | 2 +- .../jak2/levels/ruins/pillar-collapse_REF.gc | 2 +- .../jak2/levels/ruins/rapid-gunner_REF.gc | 2 +- .../jak2/levels/sewer/sewer-obs2_REF.gc | 2 +- .../jak2/levels/stadium/stadium-obs_REF.gc | 8 +-- .../jak2/levels/tomb/widow-baron_REF.gc | 4 +- .../jak2/levels/tomb/widow-extras_REF.gc | 10 +-- .../jak2/levels/under/jellyfish_REF.gc | 2 +- .../jak2/levels/under/under-obs_REF.gc | 2 +- .../jak2/levels/under/underb-master_REF.gc | 2 +- 151 files changed, 473 insertions(+), 496 deletions(-) diff --git a/test/decompiler/reference/jak2/engine/camera/cam-debug_REF.gc b/test/decompiler/reference/jak2/engine/camera/cam-debug_REF.gc index eb443c7a6f..350d895a5d 100644 --- a/test/decompiler/reference/jak2/engine/camera/cam-debug_REF.gc +++ b/test/decompiler/reference/jak2/engine/camera/cam-debug_REF.gc @@ -1109,7 +1109,7 @@ (meters 0.25) ) ) - (let ((f30-0 (* 0.5 (-> *camera-combiner* fov)))) + (let ((f30-0 (/ (-> *camera-combiner* fov) 2))) (camera-fov-frame (-> *camera-combiner* inv-camera-rot) (camera-pos) @@ -1121,7 +1121,7 @@ ) (cond ((= (-> arg0 blend-to-type) (camera-blend-to-type unknown-2)) - (let ((f0-2 (* 0.5 (-> arg0 fov)))) + (let ((f0-2 (/ (-> arg0 fov) 2))) (camera-fov-frame (the-as matrix (-> *camera-combiner* tracking)) (-> arg0 trans) @@ -1133,7 +1133,7 @@ ) ) (else - (let ((f0-4 (* 0.5 (-> arg0 fov)))) + (let ((f0-4 (/ (-> arg0 fov) 2))) (camera-fov-frame (the-as matrix (-> arg0 tracking)) (-> arg0 trans) @@ -1676,7 +1676,7 @@ ;; WARN: Return type mismatch int vs none. (defun camera-master-debug ((arg0 camera-master)) (when *display-cam-other* - (let ((f0-1 (* 0.5 (-> *camera-other-fov* data)))) + (let ((f0-1 (/ (-> *camera-other-fov* data) 2))) (camera-fov-frame *camera-other-matrix* *camera-other-trans* diff --git a/test/decompiler/reference/jak2/engine/camera/cam-layout_REF.gc b/test/decompiler/reference/jak2/engine/camera/cam-layout_REF.gc index ad8a169f33..48b2a55f8b 100644 --- a/test/decompiler/reference/jak2/engine/camera/cam-layout_REF.gc +++ b/test/decompiler/reference/jak2/engine/camera/cam-layout_REF.gc @@ -1260,7 +1260,7 @@ (defun fov->maya ((arg0 float)) (if (= arg0 0.0) 0.0 - (/ 12.700255 (tan (* 0.5 arg0))) + (/ 12.700255 (tan (/ arg0 2))) ) ) diff --git a/test/decompiler/reference/jak2/engine/camera/cam-master_REF.gc b/test/decompiler/reference/jak2/engine/camera/cam-master_REF.gc index a4fe37dd9a..08df9864f6 100644 --- a/test/decompiler/reference/jak2/engine/camera/cam-master_REF.gc +++ b/test/decompiler/reference/jak2/engine/camera/cam-master_REF.gc @@ -214,10 +214,10 @@ (let ((f30-0 (vector-dot s5-7 (-> self local-down)))) (vector--float*! s5-7 s5-7 (-> self local-down) f30-0) (if (< 0.0 f30-0) - (set! (-> self upspeed) (* 0.5 (-> self upspeed))) + (set! (-> self upspeed) (/ (-> self upspeed) 2)) ) (vector+! (-> self tpos-tgt) (-> self tpos-tgt) s5-7) - (let ((f0-26 (* 0.05 f30-0))) + (let ((f0-26 (/ f30-0 20))) (vector+float*! (-> self tpos-tgt) (-> self tpos-tgt) (-> self local-down) f0-26) ) ) diff --git a/test/decompiler/reference/jak2/engine/camera/cam-states-dbg_REF.gc b/test/decompiler/reference/jak2/engine/camera/cam-states-dbg_REF.gc index d1543db1ac..22388a14fd 100644 --- a/test/decompiler/reference/jak2/engine/camera/cam-states-dbg_REF.gc +++ b/test/decompiler/reference/jak2/engine/camera/cam-states-dbg_REF.gc @@ -56,10 +56,10 @@ ) (cond ((cpad-hold? (-> *CAMERA-bank* joypad) r2) - (set! (-> s5-0 y) (- (-> s5-0 y) (* 0.2 (-> *CAM_POINT_WATCH-bank* rot-speed) (- f26-0)))) - (set! (-> s5-0 x) (- (-> s5-0 x) (* 0.2 (-> *CAM_POINT_WATCH-bank* rot-speed) (- f0-0)))) - (+! (-> gp-0 x) (* 0.2 (-> *CAM_POINT_WATCH-bank* speed) f28-0)) - (+! (-> gp-0 z) (* 0.2 (-> *CAM_POINT_WATCH-bank* speed) f30-0)) + (set! (-> s5-0 y) (- (-> s5-0 y) (* (/ (-> *CAM_POINT_WATCH-bank* rot-speed) 5) (- f26-0)))) + (set! (-> s5-0 x) (- (-> s5-0 x) (* (/ (-> *CAM_POINT_WATCH-bank* rot-speed) 5) (- f0-0)))) + (+! (-> gp-0 x) (* (/ (-> *CAM_POINT_WATCH-bank* speed) 5) f28-0)) + (+! (-> gp-0 z) (* (/ (-> *CAM_POINT_WATCH-bank* speed) 5) f30-0)) ) (else (set! (-> s5-0 y) (- (-> s5-0 y) (* 2.0 (-> *CAM_POINT_WATCH-bank* rot-speed) (- f26-0)))) @@ -128,8 +128,8 @@ (let ((f30-0 (vector-length a0-7))) (cond (#f - (let* ((f28-0 (* 0.01 f30-0 (-> v1-0 x))) - (f26-0 (* 0.01 f30-0 (-> v1-0 y))) + (let* ((f28-0 (* (/ f30-0 100) (-> v1-0 x))) + (f26-0 (* (/ f30-0 100) (-> v1-0 y))) (f0-5 f28-0) (f0-7 (* f0-5 f0-5)) (f1-2 f26-0) @@ -312,13 +312,13 @@ ((cpad-hold? arg3 r2) (when (logtest? (-> *camera* settings master-options) (cam-master-options READ_BUTTONS)) (if (cpad-hold? arg3 r1) - (+! (-> arg1 y) (+ (* 0.2 (-> *CAM_FREE-bank* speed)) (analog-input - (the-as int (-> *cpad-list* cpads arg3 abutton 9)) - 0.0 - 32.0 - 230.0 - (* 0.2 (-> *CAM_FREE-bank* speed)) - ) + (+! (-> arg1 y) (+ (/ (-> *CAM_FREE-bank* speed) 5) (analog-input + (the-as int (-> *cpad-list* cpads arg3 abutton 9)) + 0.0 + 32.0 + 230.0 + (/ (-> *CAM_FREE-bank* speed) 5) + ) ) ) ) @@ -326,13 +326,13 @@ (when (logtest? (-> *camera* settings master-options) (cam-master-options READ_BUTTONS)) (if (cpad-hold? arg3 l1) (set! (-> arg1 y) - (- (-> arg1 y) (+ (* 0.2 (-> *CAM_FREE-bank* speed)) (analog-input - (the-as int (-> *cpad-list* cpads arg3 abutton 8)) - 0.0 - 32.0 - 230.0 - (* 0.2 (-> *CAM_FREE-bank* speed)) - ) + (- (-> arg1 y) (+ (/ (-> *CAM_FREE-bank* speed) 5) (analog-input + (the-as int (-> *cpad-list* cpads arg3 abutton 8)) + 0.0 + 32.0 + 230.0 + (/ (-> *CAM_FREE-bank* speed) 5) + ) ) ) ) @@ -372,16 +372,16 @@ ((and (not s3-0) (cpad-hold? arg3 r2)) (cond ((cpad-hold? arg3 l2) - (set! (-> arg0 y) (- (-> arg0 y) (* 0.5 (-> *CAM_FREE-bank* rot-speed) (- f26-0)))) - (set! (-> arg0 x) (- (-> arg0 x) (* 0.5 (-> *CAM_FREE-bank* rot-speed) (- f0-60)))) + (set! (-> arg0 y) (- (-> arg0 y) (* (/ (-> *CAM_FREE-bank* rot-speed) 2) (- f26-0)))) + (set! (-> arg0 x) (- (-> arg0 x) (* (/ (-> *CAM_FREE-bank* rot-speed) 2) (- f0-60)))) ) (else (set! (-> arg0 y) (- (-> arg0 y) (* (- f26-0) (-> *CAM_FREE-bank* rot-speed)))) (set! (-> arg0 x) (- (-> arg0 x) (* (- f0-60) (-> *CAM_FREE-bank* rot-speed)))) ) ) - (+! (-> arg1 x) (* 0.2 (-> *CAM_FREE-bank* speed) f28-14)) - (+! (-> arg1 z) (* 0.2 (-> *CAM_FREE-bank* speed) f30-14)) + (+! (-> arg1 x) (* (/ (-> *CAM_FREE-bank* speed) 5) f28-14)) + (+! (-> arg1 z) (* (/ (-> *CAM_FREE-bank* speed) 5) f30-14)) ) ((and (not s3-0) (cpad-hold? arg3 l2)) (+! (-> arg1 x) (* f28-14 (-> *CAM_FREE-bank* speed))) diff --git a/test/decompiler/reference/jak2/engine/camera/cam-states_REF.gc b/test/decompiler/reference/jak2/engine/camera/cam-states_REF.gc index 214a30274f..450f49abb3 100644 --- a/test/decompiler/reference/jak2/engine/camera/cam-states_REF.gc +++ b/test/decompiler/reference/jak2/engine/camera/cam-states_REF.gc @@ -2398,7 +2398,7 @@ (set! f28-0 0.0) ) (if (-> self have-phony-joystick) - (set! f28-0 (* 0.05 (-> self phony-joystick-y))) + (set! f28-0 (/ (-> self phony-joystick-y) 20)) ) (if (and (-> *camera* being-attacked) (not (time-elapsed? (-> *camera* attack-start) (seconds 0.25)))) (set! f28-0 0.05) @@ -2421,7 +2421,7 @@ (let ((f0-23 f26-0)) (when (< f26-0 0.0) (let ((f0-26 - (/ (- (-> self string-min-val z) (vector-length (-> self view-flat))) (* 0.5 (-> self string-min-val z))) + (/ (- (-> self string-min-val z) (vector-length (-> self view-flat))) (/ (-> self string-min-val z) 2)) ) ) (set! f0-23 (fmin 0.75 f0-26)) diff --git a/test/decompiler/reference/jak2/engine/camera/camera_REF.gc b/test/decompiler/reference/jak2/engine/camera/camera_REF.gc index 6fe3ff881c..b3db1fe81d 100644 --- a/test/decompiler/reference/jak2/engine/camera/camera_REF.gc +++ b/test/decompiler/reference/jak2/engine/camera/camera_REF.gc @@ -272,7 +272,7 @@ 0.0 ) ((>= 0.25 arg0) - (* 0.5 arg0) + (/ arg0 2) ) ((>= arg0 0.75) (- 1.0 (* 0.5 (- 1.0 arg0))) @@ -768,7 +768,7 @@ (the-as vector (-> this point (-> this end-point))) ) (let* ((f0-0 (vector-length s3-0)) - (f1-1 (* 0.33333334 (- 1.5 (* 0.00024414062 f0-0)))) + (f1-1 (* 0.33333334 (- 1.5 (/ f0-0 METER_LENGTH)))) ) 0.0 (let* ((f1-2 (fmax 0.0 f1-1)) @@ -798,7 +798,7 @@ (the-as vector (+ (the-as uint (-> this point 0 direction)) (* 48 v1-18))) ) (let* ((f0-5 (vector-normalize-ret-len! s2-0 1.0)) - (f0-6 (* 0.5 f0-5)) + (f0-6 (/ f0-5 2)) (f26-0 (* (fmin 1.0 f0-6) f30-0 (vector-dot arg0 s2-0))) ) (let ((f1-14 (vector-dot s2-0 s3-0))) @@ -873,7 +873,7 @@ (tracking-spline-method-19 this (* (-> this max-move) (-> pp clock time-adjust-ratio)) arg0 s4-0) (tracking-spline-method-14 this s4-0) (dotimes (s3-0 63) - (tracking-spline-method-18 this (* 0.015625 (-> this sample-len)) arg0 s4-0) + (tracking-spline-method-18 this (/ (-> this sample-len) 64) arg0 s4-0) ) (vector-float*! arg0 arg0 0.015625) (let ((a2-3 (-> s4-0 cur-pt))) @@ -1265,7 +1265,7 @@ (vector-! s2-0 s2-0 (-> arg0 follow-off)) (vector-float*! s2-0 s2-0 f0-23) ) - (+! (-> arg0 follow-blend) (* 0.016666668 (-> pp clock time-adjust-ratio))) + (+! (-> arg0 follow-blend) (/ (-> pp clock time-adjust-ratio) 60)) (vector+! (-> arg0 follow-off) (-> arg0 follow-off) s2-0) ) (else @@ -1497,7 +1497,7 @@ (let ((f28-0 (vector-dot s3-0 (the-as vector (-> arg0 vector))))) (set! sv-128 s2-0) (set! sv-112 (-> arg0 vector)) - (let ((f0-7 (* 0.8 (tan (* 0.5 arg2))))) + (let ((f0-7 (* 0.8 (tan (/ arg2 2))))) (.lvf vf1 (&-> sv-112 0 quad)) (let ((v1-11 f0-7)) (.mov vf2 v1-11) @@ -1530,7 +1530,7 @@ (let ((f28-1 (vector-dot s3-0 (-> arg0 vector 1)))) (set! sv-160 s2-0) (set! sv-144 (-> arg0 vector 1)) - (let ((f0-16 (* 0.525 (tan (* 0.5 arg2))))) + (let ((f0-16 (* 0.525 (tan (/ arg2 2))))) (.lvf vf1 (&-> sv-144 quad)) (let ((v1-32 f0-16)) (.mov vf2 v1-32) @@ -1556,7 +1556,7 @@ (let ((f28-2 (vector-dot s3-0 (-> arg0 vector 1)))) (let ((s0-1 s2-0)) (set! sv-176 (-> arg0 vector 1)) - (let ((f0-26 (* 0.525 (tan (* 0.5 arg2))))) + (let ((f0-26 (* 0.525 (tan (/ arg2 2))))) (vector-float*! s0-1 sv-176 f0-26) ) ) @@ -1716,7 +1716,7 @@ (set! sv-256 vector-into-frustum-nosmooth!) (set! sv-272 s1-0) (set! sv-288 arg1) - (let ((a2-5 (lerp-clamp arg3 (* 0.25 arg3) (-> arg0 underwater-blend value)))) + (let ((a2-5 (lerp-clamp arg3 (/ arg3 4) (-> arg0 underwater-blend value)))) (sv-256 sv-272 sv-288 a2-5) ) (cond diff --git a/test/decompiler/reference/jak2/engine/collide/collide-touch_REF.gc b/test/decompiler/reference/jak2/engine/collide/collide-touch_REF.gc index ad9491688e..3364cdcad9 100644 --- a/test/decompiler/reference/jak2/engine/collide/collide-touch_REF.gc +++ b/test/decompiler/reference/jak2/engine/collide/collide-touch_REF.gc @@ -514,7 +514,7 @@ ) ) (let ((f1-2 (- (- (vector-length gp-1) (-> v1-0 prim-core world-sphere w)) (-> s4-0 prim-core world-sphere w)))) - (vector-normalize! gp-1 (+ (-> s4-0 prim-core world-sphere w) (* 0.5 f1-2))) + (vector-normalize! gp-1 (+ (-> s4-0 prim-core world-sphere w) (/ f1-2 2))) ) (vector+! arg0 gp-1 (the-as vector (-> s4-0 prim-core))) ) diff --git a/test/decompiler/reference/jak2/engine/common_objs/blocking-plane_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/blocking-plane_REF.gc index 1a26437caf..9d9b234ca7 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/blocking-plane_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/blocking-plane_REF.gc @@ -124,11 +124,11 @@ ) (vector+! (-> s2-1 trans) s3-0 s4-0) (vector-float*! (-> s2-1 trans) (-> s2-1 trans) 0.5) - (+! (-> s2-1 trans y) (* 0.5 height)) + (+! (-> s2-1 trans y) (/ height 2)) (vector-! (the-as vector (-> s1-0 vector)) s4-0 s3-0) (let ((f30-1 (vector-normalize-ret-len! (the-as vector (-> s1-0 vector)) 1.0))) - (set! (-> s2-1 scale x) (* 0.00024414062 f30-1)) - (set! (-> s2-1 scale y) (* 0.00024414062 height)) + (set! (-> s2-1 scale x) (/ f30-1 METER_LENGTH)) + (set! (-> s2-1 scale y) (/ height METER_LENGTH)) (set! (-> s2-1 scale z) 0.0) (set! (-> s1-0 vector 1 quad) (-> (new 'static 'vector :y 1.0 :w 1.0) quad)) (vector-cross! (-> s1-0 vector 2) (the-as vector (-> s1-0 vector)) (-> s1-0 vector 1)) @@ -136,7 +136,7 @@ (matrix->quaternion (-> s2-1 quat) s1-0) (let ((v1-20 (-> this root root-prim local-sphere))) (set! (-> v1-20 x) 0.0) - (set! (-> v1-20 y) (* 0.00024414062 (* 0.5 height))) + (set! (-> v1-20 y) (* 0.00024414062 (/ height 2))) (set! (-> v1-20 z) 0.0) (let ((f0-17 0.5) (f1-7 (* f30-1 f30-1)) diff --git a/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc index cbda00792d..d6f9891a55 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc @@ -947,7 +947,7 @@ (set! (-> self root trans y) (-> self base y)) (cond ((< (-> self root transv y) -8192.0) - (set! (-> self root transv y) (* -0.5 (-> self root transv y))) + (set! (-> self root transv y) (/ (-> self root transv y) -2)) ) (else (if (and (logtest? (-> self fact options) (actor-option suck-in)) @@ -1084,7 +1084,7 @@ ) (else (if (nonzero? (-> self part)) - (set! (-> self part fade) (* 0.0033333334 f0-1)) + (set! (-> self part fade) (/ f0-1 300)) ) (when (nonzero? (-> self draw)) (logior! (-> self draw status) (draw-control-status force-fade)) @@ -3039,14 +3039,14 @@ ) ((and (>= f22-0 f0-5) (logtest? s2-1 (game-feature gun-red))) (set! s2-0 (pickup-type ammo-red)) - (set! f30-0 (* 0.5 f30-0)) + (set! f30-0 (/ f30-0 2)) ) ((and (>= f24-0 f0-5) (logtest? s2-1 (game-feature gun-blue))) (set! s2-0 (pickup-type ammo-blue)) ) ((and (>= f28-0 f0-5) (logtest? s2-1 (game-feature gun-dark))) (set! s2-0 (pickup-type ammo-dark)) - (set! f30-0 (* 0.1 f30-0)) + (set! f30-0 (/ f30-0 10)) ) (else (set! s2-0 (pickup-type eco-pill-dark)) diff --git a/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc index 84eb281656..cc208ca847 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc @@ -1363,9 +1363,9 @@ ;; WARN: Return type mismatch int vs none. (defmethod smush-update! ((this crate)) (let ((f0-0 (update! (-> this smush)))) - (set! (-> this root scale x) (+ 1.0 (* -0.5 f0-0))) + (set! (-> this root scale x) (+ 1.0 (/ f0-0 -2))) (set! (-> this root scale y) (+ 1.0 f0-0)) - (set! (-> this root scale z) (+ 1.0 (* -0.5 f0-0))) + (set! (-> this root scale z) (+ 1.0 (/ f0-0 -2))) ) 0 (none) diff --git a/test/decompiler/reference/jak2/engine/common_objs/dark-eco-pool_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/dark-eco-pool_REF.gc index f6774a678f..cf884d6db6 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/dark-eco-pool_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/dark-eco-pool_REF.gc @@ -324,7 +324,7 @@ (f0-9 (fmax -1.0 (fmin 1.0 f0-7))) ) (set! (-> gp-0 global-scale) (* 4096.0 (* 3.0 (+ 1.0 f0-9)))) - (set! (-> gp-0 individual-normal-scale) (+ 0.5 (* 0.5 f0-9))) + (set! (-> gp-0 individual-normal-scale) (+ 0.5 (/ f0-9 2))) ) ) ) diff --git a/test/decompiler/reference/jak2/engine/common_objs/water_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/water_REF.gc index 60d2b1d1fa..ab9f4fcf09 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/water_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/water_REF.gc @@ -875,7 +875,7 @@ (set! (-> *part-id-table* 506 init-specs 4 initial-valuef) (+ 24576.0 f30-0)) (set! (-> *part-id-table* 506 init-specs 19 initial-valuef) (+ 49152.0 f30-0)) (set! (-> *part-id-table* 506 init-specs 1 initial-valuef) (* 0.0000036621095 f28-0)) - (set! (-> *part-id-table* 506 init-specs 2 initial-valuef) (* 0.1 f28-0)) + (set! (-> *part-id-table* 506 init-specs 2 initial-valuef) (/ f28-0 10)) (set! (-> *part-id-table* 506 init-specs 13 initial-valuef) 0.7111111) (set! (-> *part-id-table* 506 init-specs 3 initial-valuef) (-> this wake-size)) (set! (-> *part-id-table* 506 init-specs 5 initial-valuef) (-> this wake-size)) @@ -1134,7 +1134,7 @@ ) (set-time! (-> this drip-time)) (logclear! (-> this flags) (water-flags spawn-drip)) - (seek! (-> this drip-wetness) 0.0 (* 0.001 (-> this drip-speed))) + (seek! (-> this drip-wetness) 0.0 (/ (-> this drip-speed) 1000)) (set! (-> this drip-speed) (* 1.05 (-> this drip-speed))) (if (= (-> this drip-wetness) 0.0) (set! (-> this drip-height) 0.0) @@ -1193,9 +1193,9 @@ (set! (-> *part-id-table* 512 init-specs 12 random-rangef) (* 13.653334 (* -0.075 f0-0))) (set! (-> *part-id-table* 513 init-specs 12 initial-valuef) (* 13.653334 (* -0.15 f0-0))) (set! (-> *part-id-table* 513 init-specs 12 random-rangef) (* 13.653334 (* -0.075 f0-0))) - (set! (-> *part-id-table* 519 init-specs 2 initial-valuef) (* 4096.0 (* 0.1 f0-0))) + (set! (-> *part-id-table* 519 init-specs 2 initial-valuef) (* 4096.0 (/ f0-0 10))) (set! (-> *part-id-table* 519 init-specs 2 random-rangef) (* 4096.0 (* 0.4 f0-0))) - (set! (-> *part-id-table* 519 init-specs 4 initial-valuef) (* 4096.0 (* 0.1 f0-0))) + (set! (-> *part-id-table* 519 init-specs 4 initial-valuef) (* 4096.0 (/ f0-0 10))) (set! (-> *part-id-table* 519 init-specs 4 random-rangef) (* 4096.0 (* 0.4 f0-0))) (set! (-> *part-id-table* 519 init-specs 9 initial-valuef) (* 13.653334 (* 1.5 f0-0))) (set! (-> *part-id-table* 519 init-specs 9 random-rangef) (* 13.653334 (* 3.4 f0-0))) @@ -1209,11 +1209,11 @@ (set! (-> *part-id-table* 516 init-specs 10 random-rangef) (* 13.653334 (* 2.4 f0-0))) (set! (-> *part-id-table* 516 init-specs 11 initial-valuef) (* 13.653334 (* 1.5 f0-0))) (set! (-> *part-id-table* 516 init-specs 11 random-rangef) (* 13.653334 (* 2.4 f0-0))) - (set! (-> *part-id-table* 520 init-specs 1 initial-valuef) (* 0.5 f0-0)) - (set! (-> *part-id-table* 520 init-specs 2 initial-valuef) (* 4096.0 (* -0.25 f0-0))) - (set! (-> *part-id-table* 520 init-specs 2 random-rangef) (* 4096.0 (* 0.5 f0-0))) - (set! (-> *part-id-table* 520 init-specs 3 initial-valuef) (* 4096.0 (* -0.25 f0-0))) - (set! (-> *part-id-table* 520 init-specs 3 random-rangef) (* 4096.0 (* 0.5 f0-0))) + (set! (-> *part-id-table* 520 init-specs 1 initial-valuef) (/ f0-0 2)) + (set! (-> *part-id-table* 520 init-specs 2 initial-valuef) (* 4096.0 (/ f0-0 -4))) + (set! (-> *part-id-table* 520 init-specs 2 random-rangef) (* 4096.0 (/ f0-0 2))) + (set! (-> *part-id-table* 520 init-specs 3 initial-valuef) (* 4096.0 (/ f0-0 -4))) + (set! (-> *part-id-table* 520 init-specs 3 random-rangef) (* 4096.0 (/ f0-0 2))) (set! (-> *part-id-table* 520 init-specs 10 initial-valuef) (* 13.653334 (* -0.75 f0-0))) (set! (-> *part-id-table* 520 init-specs 10 random-rangef) (* 13.653334 (* 1.5 f0-0))) (set! (-> *part-id-table* 520 init-specs 12 initial-valuef) (* 13.653334 (* -0.75 f0-0))) @@ -1222,7 +1222,7 @@ (set! (-> *part-id-table* 520 init-specs 11 random-rangef) (* 13.653334 (* 2.0 f0-0))) (set! (-> *part-id-table* 520 init-specs 15 initial-valuef) (* 13.653334 (* -0.3 f0-0))) (set! (-> *part-id-table* 520 init-specs 15 random-rangef) (* 13.653334 (* -0.075 f0-0))) - (set! (-> *part-id-table* 517 init-specs 1 initial-valuef) (* 0.5 f0-0)) + (set! (-> *part-id-table* 517 init-specs 1 initial-valuef) (/ f0-0 2)) (set! (-> *part-id-table* 517 init-specs 2 initial-valuef) (* 1.2 f0-0)) (set! (-> *part-id-table* 517 init-specs 9 initial-valuef) (* 13.653334 f0-0)) (set! (-> *part-id-table* 517 init-specs 9 random-rangef) (* 13.653334 (* 2.0 f0-0))) @@ -1245,10 +1245,10 @@ (set! (-> *part-id-table* 515 init-specs 13 initial-valuef) (* 13.653334 (* -0.3 f0-0))) (set! (-> *part-id-table* 515 init-specs 13 random-rangef) (* 13.653334 (* -0.075 f0-0))) (set! (-> *part-id-table* 514 init-specs 2 initial-valuef) (* 4096.0 (* 1.2 f0-0))) - (set! (-> *part-id-table* 514 init-specs 2 random-rangef) (* 4096.0 (* 0.2 f0-0))) + (set! (-> *part-id-table* 514 init-specs 2 random-rangef) (* 4096.0 (/ f0-0 5))) (set! (-> *part-id-table* 514 init-specs 3 initial-valuef) (* 4096.0 (* 0.4 f0-0))) (set! (-> *part-id-table* 514 init-specs 3 random-rangef) (* 4096.0 (* 1.2 f0-0))) - (set! (-> *part-id-table* 514 init-specs 7 initial-valuef) (* 4096.0 (* 0.2 f0-0))) + (set! (-> *part-id-table* 514 init-specs 7 initial-valuef) (* 4096.0 (/ f0-0 5))) (set! (-> *part-id-table* 514 init-specs 7 random-rangef) (* 4096.0 (* 2.2 f0-0))) (set! (-> *part-id-table* 518 init-specs 2 initial-valuef) (* 4096.0 (* 0.3 f0-0))) (set! (-> *part-id-table* 518 init-specs 2 random-rangef) (* 4096.0 (* 0.9 f0-0))) @@ -1361,7 +1361,7 @@ (set! (-> *part-id-table* 506 init-specs 4 initial-valuef) (+ 24576.0 arg0)) (set! (-> *part-id-table* 506 init-specs 19 initial-valuef) (+ 49152.0 arg0)) (set! (-> *part-id-table* 506 init-specs 1 initial-valuef) (* 0.0000036621095 f30-0)) - (set! (-> *part-id-table* 506 init-specs 2 initial-valuef) (* 0.1 f30-0)) + (set! (-> *part-id-table* 506 init-specs 2 initial-valuef) (/ f30-0 10)) (set! (-> *part-id-table* 506 init-specs 13 initial-valuef) 0.7111111) (set! (-> *part-id-table* 506 init-specs 3 initial-valuef) arg3) (set! (-> *part-id-table* 506 init-specs 5 initial-valuef) arg3) diff --git a/test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc b/test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc index c3c71c6239..c1524e44cf 100644 --- a/test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc @@ -267,13 +267,13 @@ (case arg0 (('close) (if (and *math-camera* *subdivide-settings*) - (* 0.00024414062 (-> *subdivide-settings* close 7)) + (/ (-> *subdivide-settings* close 7) METER_LENGTH) arg3 ) ) (('far) (if (and *math-camera* *subdivide-settings*) - (* 0.00024414062 (-> *subdivide-settings* far 7)) + (/ (-> *subdivide-settings* far 7) METER_LENGTH) arg3 ) ) @@ -548,7 +548,7 @@ (if (= arg1 (debug-menu-msg press)) (set! (-> v1-0 camera-to-bbox-dist) (* 4096.0 arg2)) ) - (* 0.00024414062 (-> v1-0 camera-to-bbox-dist)) + (/ (-> v1-0 camera-to-bbox-dist) METER_LENGTH) ) ) @@ -1015,7 +1015,7 @@ ) ) ) - (* 0.00024414062 f1-2) + (/ f1-2 METER_LENGTH) ) ) (else @@ -1053,7 +1053,7 @@ (set! (-> (the-as prototype-bucket-tie gp-0) tie-vanish-far) f0-0) ) ) - (* 0.00024414062 f0-0) + (/ f0-0 METER_LENGTH) ) ) (else @@ -2613,7 +2613,7 @@ (set! (-> gp-0 dists x) (* 4096.0 arg2)) (prototype-bucket-recalc-fields gp-0) ) - (* 0.00024414062 (-> gp-0 dists x)) + (/ (-> gp-0 dists x) METER_LENGTH) ) (else (empty) @@ -2644,7 +2644,7 @@ (set! (-> gp-0 dists w) (* 4096.0 arg2)) (prototype-bucket-recalc-fields gp-0) ) - (* 0.00024414062 (-> gp-0 dists w)) + (/ (-> gp-0 dists w) METER_LENGTH) ) (else (empty) @@ -5256,13 +5256,13 @@ fog-dists x ) - (* 0.00024414062 - (-> *overide-mood-fog-table* + (/ (-> *overide-mood-fog-table* data (the-as uint (logand (-> *time-of-day-context* mode) (time-of-day-palette-id unk0 unk1 unk2))) fog-dists x ) + METER_LENGTH ) ) (set! (-> *overide-mood-fog-table* @@ -5271,13 +5271,13 @@ fog-dists y ) - (* 0.00024414062 - (-> *overide-mood-fog-table* + (/ (-> *overide-mood-fog-table* data (the-as uint (logand (-> *time-of-day-context* mode) (time-of-day-palette-id unk0 unk1 unk2))) fog-dists y ) + METER_LENGTH ) ) ) @@ -5290,10 +5290,10 @@ (dotimes (v1-1 8) (set! (-> *overide-mood-fog-table* data v1-1 fog-color w) 1.0) (set! (-> *overide-mood-fog-table* data v1-1 fog-dists x) - (* 0.00024414062 (-> *overide-mood-fog-table* data v1-1 fog-dists x)) + (/ (-> *overide-mood-fog-table* data v1-1 fog-dists x) METER_LENGTH) ) (set! (-> *overide-mood-fog-table* data v1-1 fog-dists y) - (* 0.00024414062 (-> *overide-mood-fog-table* data v1-1 fog-dists y)) + (/ (-> *overide-mood-fog-table* data v1-1 fog-dists y) METER_LENGTH) ) ) #f @@ -5620,10 +5620,10 @@ (set! (-> *overide-mood-color-table* data v1-2 amb-color w) 1.0) (set! (-> *overide-mood-fog-table* data v1-2 fog-color w) 1.0) (set! (-> *overide-mood-fog-table* data v1-2 fog-dists x) - (* 0.00024414062 (-> *overide-mood-fog-table* data v1-2 fog-dists x)) + (/ (-> *overide-mood-fog-table* data v1-2 fog-dists x) METER_LENGTH) ) (set! (-> *overide-mood-fog-table* data v1-2 fog-dists y) - (* 0.00024414062 (-> *overide-mood-fog-table* data v1-2 fog-dists y)) + (/ (-> *overide-mood-fog-table* data v1-2 fog-dists y) METER_LENGTH) ) (set-vector! (-> *time-of-day-context* times v1-2) 1.0 1.0 1.0 1.0) ) diff --git a/test/decompiler/reference/jak2/engine/debug/editable-player_REF.gc b/test/decompiler/reference/jak2/engine/debug/editable-player_REF.gc index 57faf94014..2df1f39c41 100644 --- a/test/decompiler/reference/jak2/engine/debug/editable-player_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/editable-player_REF.gc @@ -644,7 +644,7 @@ ) (else (vector-! s5-1 (edit-get-trans s1-2) s4-1) - (let ((f0-9 (* 0.00390625 f30-1 (vector-length s5-1)))) + (let ((f0-9 (* (/ f30-1 256) (vector-length s5-1)))) (set! f0-6 (fmax -40960.0 (fmin 40960.0 f0-9))) ) (set! (-> arg0 move-speed) f0-6) @@ -694,7 +694,7 @@ ) (else (vector-! s5-2 (edit-get-trans s1-3) s4-2) - (let ((f0-21 (* 0.00390625 f30-2 (vector-length s5-2)))) + (let ((f0-21 (* (/ f30-2 256) (vector-length s5-2)))) (set! f0-18 (fmax -40960.0 (fmin 40960.0 f0-21))) ) (set! (-> arg0 move-speed) f0-18) @@ -744,7 +744,7 @@ ) (else (vector-! s5-3 (edit-get-trans s1-4) s4-3) - (let ((f0-32 (* 0.00390625 f30-3 (vector-length s5-3)))) + (let ((f0-32 (* (/ f30-3 256) (vector-length s5-3)))) (set! (-> arg0 move-speed) f0-32) (set! f0-29 (fmax -40960.0 (fmin 40960.0 f0-32))) ) diff --git a/test/decompiler/reference/jak2/engine/debug/editable_REF.gc b/test/decompiler/reference/jak2/engine/debug/editable_REF.gc index 9efcbe6e2c..d9641ec4b4 100644 --- a/test/decompiler/reference/jak2/engine/debug/editable_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/editable_REF.gc @@ -1152,7 +1152,7 @@ (* 0.00024414062 (- (-> this trans x) (-> arg0 level-offset x))) (* 0.00024414062 (- (-> this trans y) (-> arg0 level-offset y))) (* 0.00024414062 (- (-> this trans z) (-> arg0 level-offset z))) - (* 0.00024414062 (-> this radius)) + (/ (-> this radius) METER_LENGTH) ) (if (= (-> this direction w) 0.0) (format s5-0 ", dir_x=0.0, dir_y=0.0, dir_z=0.0") diff --git a/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc b/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc index 10fba8472e..1ca2634a7a 100644 --- a/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc @@ -1896,7 +1896,7 @@ (let ((gp-0 (-> self nav-graph edge-array data (-> self selected-index)))) (format *stdcon* "Density = ~F~%" (-> gp-0 density)) (logior! (-> gp-0 mysql-save-flag) (mysql-save-flag update)) - (+! (-> gp-0 density) (* 0.01 (-> *mouse* speedx))) + (+! (-> gp-0 density) (/ (-> *mouse* speedx) 100)) (if (< (-> gp-0 density) 0.0) (set! (-> gp-0 density) 0.0) ) diff --git a/test/decompiler/reference/jak2/engine/draw/drawable_REF.gc b/test/decompiler/reference/jak2/engine/draw/drawable_REF.gc index 84eaabc9e3..a5e179f1fb 100644 --- a/test/decompiler/reference/jak2/engine/draw/drawable_REF.gc +++ b/test/decompiler/reference/jak2/engine/draw/drawable_REF.gc @@ -389,7 +389,7 @@ ) ) (set! (-> arg0 rdists z) (/ 1.0 (- (-> arg0 dists w) (-> arg0 dists z)))) - (set! (-> arg0 dists y) (* 0.5 (-> arg0 dists x))) + (set! (-> arg0 dists y) (/ (-> arg0 dists x) 2)) (set! (-> arg0 rdists y) (/ 1.0 (-> arg0 dists y))) arg0 ) diff --git a/test/decompiler/reference/jak2/engine/game/effect-control_REF.gc b/test/decompiler/reference/jak2/engine/game/effect-control_REF.gc index f58eaad01c..cebdf05bed 100644 --- a/test/decompiler/reference/jak2/engine/game/effect-control_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/effect-control_REF.gc @@ -1154,7 +1154,7 @@ (sound-play-by-name (sound-name-with-material "zoom-land" (-> self control ground-pat) "") (new-sound-id) - (the int (* 1024.0 (* 0.000016276043 (-> self control ground-impact-vel)))) + (the int (* 1024.0 (/ (-> self control ground-impact-vel) (meters 15)))) 0 0 (sound-group sfx) diff --git a/test/decompiler/reference/jak2/engine/geometry/cylinder_REF.gc b/test/decompiler/reference/jak2/engine/geometry/cylinder_REF.gc index 7fa3c75722..9488267590 100644 --- a/test/decompiler/reference/jak2/engine/geometry/cylinder_REF.gc +++ b/test/decompiler/reference/jak2/engine/geometry/cylinder_REF.gc @@ -83,7 +83,7 @@ (vector-cross! s1-0 (-> this axis) (new 'static 'vector :y 1.0)) ) (vector-normalize! s1-0 (-> this radius)) - (vector-float*! s0-0 (-> this axis) (* 0.125 (-> this length))) + (vector-float*! s0-0 (-> this axis) (/ (-> this length) 8)) (let ((s5-0 (new 'stack-no-clear 'cylinder-verts)) (s4-0 (new 'stack-no-clear 'cylinder-verts)) (s3-0 (new 'stack-no-clear 'matrix)) @@ -270,7 +270,7 @@ (vector-cross! s1-0 (-> this axis) (new 'static 'vector :y 1.0)) ) (vector-normalize! s1-0 (-> this radius)) - (vector-float*! s0-0 (-> this axis) (* 0.14285715 (-> this length))) + (vector-float*! s0-0 (-> this axis) (/ (-> this length) 7)) (let ((s5-0 (new 'stack-no-clear 'cylinder-flat-verts)) (s4-0 (new 'stack-no-clear 'cylinder-flat-verts)) (s3-0 (new 'stack-no-clear 'matrix)) diff --git a/test/decompiler/reference/jak2/engine/geometry/geometry_REF.gc b/test/decompiler/reference/jak2/engine/geometry/geometry_REF.gc index 180f6daa10..a082c3d0db 100644 --- a/test/decompiler/reference/jak2/engine/geometry/geometry_REF.gc +++ b/test/decompiler/reference/jak2/engine/geometry/geometry_REF.gc @@ -96,7 +96,7 @@ (.svf (&-> arg0 quad) vf3) (let* ((f0-0 (vector-length arg0)) (f1-1 (vector-dot arg0 arg2)) - (f0-2 (- (* 0.02 f0-0) f1-1)) + (f0-2 (- (/ f0-0 50) f1-1)) ) (vector+float*! arg0 arg0 arg2 (fmin 16384.0 (* 16.0 f0-2))) ) @@ -477,11 +477,11 @@ (f26-0 (vector-dot arg1 arg2)) (f28-0 (sqrtf (* 0.5 (- 1.0 f26-0)))) ) - (let ((f0-5 (sin (* 0.5 arg3)))) + (let ((f0-5 (sin (/ arg3 2)))) (cond ((< f0-5 f28-0) (set! f28-0 f0-5) - (set! (-> arg0 w) (cos (* 0.5 arg3))) + (set! (-> arg0 w) (cos (/ arg3 2))) ) (else (set! (-> arg0 w) (sqrtf (* 0.5 (+ 1.0 f26-0)))) @@ -505,11 +505,11 @@ (f26-0 (+ 1.0 (* arg4 (+ -1.0 (vector-dot arg1 arg2))))) (f28-0 (sqrtf (* 0.5 (- 1.0 f26-0)))) ) - (let ((f0-5 (sin (* 0.5 arg3)))) + (let ((f0-5 (sin (/ arg3 2)))) (cond ((< f0-5 f28-0) (set! f28-0 f0-5) - (set! (-> arg0 w) (cos (* 0.5 arg3))) + (set! (-> arg0 w) (cos (/ arg3 2))) ) (else (set! (-> arg0 w) (sqrtf (* 0.5 (+ 1.0 f26-0)))) @@ -1704,7 +1704,7 @@ ) (while (> s3-0 0) (+! s3-0 -1) - (set! f28-0 (* 0.5 f28-0)) + (set! f28-0 (/ f28-0 2)) (let ((v1-6 (cond ((< f22-0 f20-0) (curve-get-pos! s1-0 s0-1 arg0) diff --git a/test/decompiler/reference/jak2/engine/gfx/foreground/ripple_REF.gc b/test/decompiler/reference/jak2/engine/gfx/foreground/ripple_REF.gc index 53e1672245..c5936e941e 100644 --- a/test/decompiler/reference/jak2/engine/gfx/foreground/ripple_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/foreground/ripple_REF.gc @@ -231,7 +231,7 @@ (if (< f0-23 0.0) (set! f0-23 (-> gp-0 global-scale)) ) - (+ f30-0 (* 0.0078125 f1-12 f0-23)) + (+ f30-0 (* (/ f1-12 128) f0-23)) ) ) ) diff --git a/test/decompiler/reference/jak2/engine/gfx/hw/video_REF.gc b/test/decompiler/reference/jak2/engine/gfx/hw/video_REF.gc index 742d6d90c8..d7a3d434b7 100644 --- a/test/decompiler/reference/jak2/engine/gfx/hw/video_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/hw/video_REF.gc @@ -32,7 +32,7 @@ (set! (-> *video-params* reset-video-mode) #t) (set! (-> *math-camera* isometric vector 1 y) 0.5) (set! (-> *math-camera* y-clip) 416.0) - (set! (-> *math-camera* y-pix) (* 0.5 (-> *math-camera* y-clip))) + (set! (-> *math-camera* y-pix) (/ (-> *math-camera* y-clip) 2)) (set! *profile-y* 1848) (set! (-> *video-params* set-video-mode) #t) 0 diff --git a/test/decompiler/reference/jak2/engine/gfx/math-camera_REF.gc b/test/decompiler/reference/jak2/engine/gfx/math-camera_REF.gc index a24cd23d18..7056f548e6 100644 --- a/test/decompiler/reference/jak2/engine/gfx/math-camera_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/math-camera_REF.gc @@ -55,7 +55,7 @@ Without this corrector, the fogginess of the world would change as the FOV chang "Compute some one-time camera constants. These should only change when changing aspect ratio." (local-vars (sv-16 float)) - (set! (-> arg0 x-ratio) (tan (* 0.5 arg3))) + (set! (-> arg0 x-ratio) (tan (/ arg3 2))) (if (= arg2 'aspect4x3) (set! (-> arg0 y-ratio) (* 0.75 (-> arg0 x-ratio))) (set! (-> arg0 y-ratio) (* 0.5625 (-> arg0 x-ratio))) diff --git a/test/decompiler/reference/jak2/engine/gfx/mood/mood-funcs2_REF.gc b/test/decompiler/reference/jak2/engine/gfx/mood/mood-funcs2_REF.gc index 6d4b9172e2..8247392ce9 100644 --- a/test/decompiler/reference/jak2/engine/gfx/mood/mood-funcs2_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/mood/mood-funcs2_REF.gc @@ -686,7 +686,7 @@ (if (or (and (>= a0-37 350) (< a0-37 400)) (>= a0-37 500)) (+! f4-0 f0-8) ) - (let ((f0-10 (* 0.0006510417 f4-0))) + (let ((f0-10 (/ f4-0 1536))) (set! (-> arg0 times 2 w) f0-10) (set! (-> arg0 light-group 3 dir1 extra x) f0-10) ) @@ -725,7 +725,7 @@ (if (nonzero? (-> s5-0 spec-hog-2-on)) (set! (-> s5-0 spec-hog-2-on initial-valuef) f0-19) ) - (set! (-> arg0 times 3 w) (+ 0.5 (* 0.0009765625 f0-19))) + (set! (-> arg0 times 3 w) (+ 0.5 (/ f0-19 1024))) ) (set! (-> arg0 light-group 4 dir1 extra x) (-> arg0 times 3 w)) (let ((v1-6 (mod v1-5 600))) @@ -738,7 +738,7 @@ (if (nonzero? (-> s5-0 spec-hiphog-on2)) (set! (-> s5-0 spec-hiphog-on2 initial-valuef) f0-24) ) - (set! (-> arg0 times 4 w) (* 0.001953125 f0-24)) + (set! (-> arg0 times 4 w) (/ f0-24 512)) ) ) (else @@ -759,7 +759,7 @@ (if (nonzero? (-> s5-0 spec-clock-moon)) (set! (-> s5-0 spec-clock-moon initial-valuef) f0-31) ) - (set-vector! (-> arg0 times 5) 0.471 0.722 1.0 (+ 0.5 (* 0.001953125 f0-31))) + (set-vector! (-> arg0 times 5) 0.471 0.722 1.0 (+ 0.5 (/ f0-31 512))) ) ) (else @@ -767,7 +767,7 @@ (if (nonzero? (-> s5-0 spec-clock-sun)) (set! (-> s5-0 spec-clock-sun initial-valuef) f0-35) ) - (set-vector! (-> arg0 times 5) 1.0 0.99 0.54 (+ 0.5 (* 0.0009765625 f0-35))) + (set-vector! (-> arg0 times 5) 1.0 0.99 0.54 (+ 0.5 (/ f0-35 1024))) ) ) ) @@ -2803,7 +2803,7 @@ ) (when (!= (-> gp-0 explosion) 0.0) (set! (-> arg0 times 7 w) (-> gp-0 explosion)) - (let ((f0-15 (- 1.0 (* 0.5 (-> gp-0 explosion))))) + (let ((f0-15 (- 1.0 (/ (-> gp-0 explosion) 2)))) (set! (-> arg0 times 2 w) (* (-> arg0 times 2 w) f0-15)) (set! (-> arg0 times 3 w) (* (-> arg0 times 3 w) f0-15)) (set! (-> arg0 times 0 w) (* (-> arg0 times 0 w) f0-15)) @@ -2939,7 +2939,7 @@ ((< 0.0 (-> gp-1 flash)) (set! (-> gp-1 level) (-> gp-1 flash)) (set-vector! (-> gp-1 dir) 0.0 0.0 1.0 0.0) - (set! (-> gp-1 flash) (- (-> gp-1 flash) (* 0.5 (-> *display* base-clock seconds-per-frame)))) + (set! (-> gp-1 flash) (- (-> gp-1 flash) (/ (-> *display* base-clock seconds-per-frame) 2))) (set! (-> gp-1 time) 0.0) ) (else @@ -2963,7 +2963,7 @@ (let ((f30-0 (vector-length (-> gp-1 pos)))) (set! (-> gp-1 dir quad) (-> gp-1 pos quad)) (vector-normalize! (-> gp-1 dir) 1.0) - (set! (-> gp-1 level) (* (-> gp-1 scale) (- 1.0 (fmin 1.0 (* 0.000009765625 f30-0))))) + (set! (-> gp-1 level) (* (-> gp-1 scale) (- 1.0 (fmin 1.0 (/ f30-0 (meters 25)))))) ) (set! (-> gp-1 pos z) (- (-> gp-1 pos z) (* (-> gp-1 delta) (-> *display* base-clock seconds-per-frame)))) ) @@ -3077,7 +3077,7 @@ (set! (-> arg0 times 5 w) (+ (-> gp-1 purple) (-> gp-1 purple-noise))) (when (not (paused?)) (seek! (-> gp-1 purple) 0.0 (* 4.0 (seconds-per-frame))) - (set! (-> gp-1 purple-noise) (rand-vu-float-range 0.0 (* 0.2 (-> gp-1 purple)))) + (set! (-> gp-1 purple-noise) (rand-vu-float-range 0.0 (/ (-> gp-1 purple) 5))) (+! (-> gp-1 rot) (* 16384.0 (seconds-per-frame))) ) ) diff --git a/test/decompiler/reference/jak2/engine/gfx/mood/mood-funcs_REF.gc b/test/decompiler/reference/jak2/engine/gfx/mood/mood-funcs_REF.gc index f44a190202..966b50e85b 100644 --- a/test/decompiler/reference/jak2/engine/gfx/mood/mood-funcs_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/mood/mood-funcs_REF.gc @@ -649,7 +649,7 @@ ) (cond ((< f0-3 15.0) - (set! (-> gp-1 blink) (* 0.06666667 f0-3)) + (set! (-> gp-1 blink) (/ f0-3 15)) ) ((< 45.0 f0-3) (set! (-> gp-1 blink) (* 0.06666667 (- 60.0 f0-3))) @@ -721,7 +721,7 @@ (set! (-> v1-12 r) 1.0) ) (let ((f0-8 (- 1.0 (get-sphere-interp a0-9 a1-3 1024000.0 2048000.0)))) - (update-mood-weather! *mood-control* (+ 0.25 (* 0.75 f0-8)) (+ 0.5 (* 0.5 f0-8)) 30.0 30.0) + (update-mood-weather! *mood-control* (+ 0.25 (* 0.75 f0-8)) (+ 0.5 (/ f0-8 2)) 30.0 30.0) ) ) ) @@ -1712,7 +1712,7 @@ (let ((v1-1 (level-get *level* 'palent))) (when v1-1 (let ((v1-2 (the-as object (-> v1-1 mood-context state)))) - (set! (-> (the-as palent-states v1-2) turret-value) (* 0.5 arg0)) + (set! (-> (the-as palent-states v1-2) turret-value) (/ arg0 2)) ) ) ) @@ -1828,9 +1828,9 @@ ;; definition for function update-village1-lights (defun update-village1-lights ((arg0 mood-context)) (let ((v1-0 (-> arg0 light-group))) - (set! (-> v1-0 0 dir0 extra x) (* 0.5 (-> v1-0 0 dir0 extra x))) - (set! (-> v1-0 0 dir1 extra x) (* 0.5 (-> v1-0 0 dir1 extra x))) - (set! (-> v1-0 0 dir2 extra x) (* 0.5 (-> v1-0 0 dir2 extra x))) + (set! (-> v1-0 0 dir0 extra x) (/ (-> v1-0 0 dir0 extra x) 2)) + (set! (-> v1-0 0 dir1 extra x) (/ (-> v1-0 0 dir1 extra x) 2)) + (set! (-> v1-0 0 dir2 extra x) (/ (-> v1-0 0 dir2 extra x) 2)) (set! (-> v1-0 0 ambi extra x) (* 0.75 (-> v1-0 0 ambi extra x))) ) ) @@ -1848,7 +1848,7 @@ (set! (-> arg0 times 6 w) (- 1.0 f0-0)) (set! (-> arg0 times 7 w) f0-0) (if (!= f0-0 0.0) - (set-filter-color! (- 1.0 (* 0.25 f0-0)) (- 1.0 (* 0.5 f0-0)) 1.0) + (set-filter-color! (- 1.0 (/ f0-0 4)) (- 1.0 (/ f0-0 2)) 1.0) ) ) (when (not (paused?)) diff --git a/test/decompiler/reference/jak2/engine/gfx/mood/mood-tables2_REF.gc b/test/decompiler/reference/jak2/engine/gfx/mood/mood-tables2_REF.gc index 7f193187cf..71710bc184 100644 --- a/test/decompiler/reference/jak2/engine/gfx/mood/mood-tables2_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/mood/mood-tables2_REF.gc @@ -428,8 +428,8 @@ (format 0 " :fog-start (meters ~f) :fog-end (meters ~f) :fog-min ~f :fog-max ~f ~%" - (* 0.00024414062 (-> *overide-table* mood-fog-table data _fog-idx fog-dists x)) - (* 0.00024414062 (-> *overide-table* mood-fog-table data _fog-idx fog-dists y)) + (/ (-> *overide-table* mood-fog-table data _fog-idx fog-dists x) METER_LENGTH) + (/ (-> *overide-table* mood-fog-table data _fog-idx fog-dists y) METER_LENGTH) (-> *overide-table* mood-fog-table data _fog-idx fog-dists w) (-> *overide-table* mood-fog-table data _fog-idx fog-dists z) ) diff --git a/test/decompiler/reference/jak2/engine/gfx/mood/mood_REF.gc b/test/decompiler/reference/jak2/engine/gfx/mood/mood_REF.gc index ef07fcabe7..cae9492d5f 100644 --- a/test/decompiler/reference/jak2/engine/gfx/mood/mood_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/mood/mood_REF.gc @@ -807,8 +807,8 @@ (set! (-> arg0 times arg1 w) f30-1) (when (not (paused?)) (if (< 0.75 f30-1) - (set! (-> gp-0 fade) (- (-> gp-0 fade) (* 0.04 (-> pp clock time-adjust-ratio)))) - (set! (-> gp-0 fade) (- (-> gp-0 fade) (* 0.02 (-> pp clock time-adjust-ratio)))) + (set! (-> gp-0 fade) (- (-> gp-0 fade) (/ (-> pp clock time-adjust-ratio) 25))) + (set! (-> gp-0 fade) (- (-> gp-0 fade) (/ (-> pp clock time-adjust-ratio) 50))) ) ) ) @@ -1661,11 +1661,11 @@ (format *stdcon* "overide fog ~f~%" (-> this overide fog)) ) (else - (format *stdcon* "time until random cloud ~f~%" (* 0.0033333334 (-> this time-until-random cloud))) + (format *stdcon* "time until random cloud ~f~%" (/ (-> this time-until-random cloud) 300)) (format *stdcon* "current cloud ~f~%" (-> this current-interp cloud)) (format *stdcon* "target cloud ~f~%" (-> this target-interp cloud)) (format *stdcon* "speed cloud ~f~%" (* (/ 1.0 (-> this speed-interp cloud)) (seconds-per-frame))) - (format *stdcon* "time until random fog ~f~%" (* 0.0033333334 (-> this time-until-random fog))) + (format *stdcon* "time until random fog ~f~%" (/ (-> this time-until-random fog) 300)) (format *stdcon* "current fog ~f~%" (-> this current-interp fog)) (format *stdcon* "target fog ~f~%" (-> this target-interp fog)) (format *stdcon* "speed fog ~f~%" (* (/ 1.0 (-> this speed-interp fog)) (seconds-per-frame))) diff --git a/test/decompiler/reference/jak2/engine/gfx/mood/time-of-day_REF.gc b/test/decompiler/reference/jak2/engine/gfx/mood/time-of-day_REF.gc index b2b21c735a..6f9cc38545 100644 --- a/test/decompiler/reference/jak2/engine/gfx/mood/time-of-day_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/mood/time-of-day_REF.gc @@ -198,7 +198,7 @@ (-> self time-of-day) ) (('time-of-day-norm) - (* 0.041666668 (-> self time-of-day)) + (/ (-> self time-of-day) 24) ) (('hour) (-> self hours) @@ -311,10 +311,10 @@ (set! (-> *overide-mood-color-table* data v1-8 amb-color w) 1.0) (set! (-> *overide-mood-fog-table* data v1-8 fog-color w) 1.0) (set! (-> *overide-mood-fog-table* data v1-8 fog-dists x) - (* 0.00024414062 (-> *overide-mood-fog-table* data v1-8 fog-dists x)) + (/ (-> *overide-mood-fog-table* data v1-8 fog-dists x) METER_LENGTH) ) (set! (-> *overide-mood-fog-table* data v1-8 fog-dists y) - (* 0.00024414062 (-> *overide-mood-fog-table* data v1-8 fog-dists y)) + (/ (-> *overide-mood-fog-table* data v1-8 fog-dists y) METER_LENGTH) ) (set-vector! (-> *time-of-day-context* times v1-8) 1.0 1.0 1.0 1.0) ) @@ -376,7 +376,7 @@ ) (let* ((f0-23 (fmax (fmax (-> s4-0 x) (-> s4-0 y)) (-> s4-0 z))) (f2-14 (fmax (fmax (-> s5-0 x) (-> s5-0 y)) (-> s5-0 z))) - (f0-27 (fmin 0.85 (- 1.0 (/ (* 0.5 f2-14) (+ f0-23 f2-14))))) + (f0-27 (fmin 0.85 (- 1.0 (/ (/ f2-14 2) (+ f0-23 f2-14))))) (v0-1 (-> arg0 current-shadow-color)) ) (set! (-> v0-1 x) f0-27) @@ -643,8 +643,8 @@ (v1-1 (-> *time-of-day-context* current-fog)) (f1-0 (-> v1-1 fog-dists x)) (f2-0 (-> v1-1 fog-dists y)) - (f3-1 (* 0.003921569 (-> v1-1 fog-dists w))) - (f4-2 (* 0.003921569 (-> v1-1 fog-dists z))) + (f3-1 (/ (-> v1-1 fog-dists w) 255)) + (f4-2 (/ (-> v1-1 fog-dists z) 255)) ) (+ f4-2 (* (fmax 0.0 (fmin 1.0 (/ (- f0-0 f1-0) (- f2-0 f1-0)))) (- f3-1 f4-2))) ) diff --git a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-mid_REF.gc b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-mid_REF.gc index c937b96284..c3db5a1be4 100644 --- a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-mid_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-mid_REF.gc @@ -17,7 +17,7 @@ (set-vector! (-> arg0 constants) -0.25 -0.5 0.0 393216.0) (let* ((s4-0 (-> (matrix-local->world #f #f) vector 2)) (f0-12 (- 1.5 (* 0.000015258789 (atan (-> s4-0 x) (-> s4-0 z))))) - (f1-1 (+ 0.5 (* -0.5 (-> s4-0 y)))) + (f1-1 (+ 0.5 (/ (-> s4-0 y) -2))) ) (set-vector! (-> arg0 constants2) f0-12 f1-1 1.0 0.0) ) @@ -269,7 +269,7 @@ (let ((f0-16 (* 128.0 (-> *time-of-day-context* ocean-alpha)))) (if (-> *time-of-day-context* sky) (set-vector! (-> arg0 env-color) f0-16 f0-16 f0-16 f0-16) - (set-vector! (-> arg0 env-color) f0-16 f0-16 (* 0.5 f0-16) f0-16) + (set-vector! (-> arg0 env-color) f0-16 f0-16 (/ f0-16 2) f0-16) ) ) (set-vector! (-> arg0 index-table 0) 63 84 66 0) diff --git a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-near_REF.gc b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-near_REF.gc index bfd27db529..7414aa3d49 100644 --- a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-near_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-near_REF.gc @@ -47,7 +47,7 @@ (set-vector! (-> arg0 constants) -0.25 -0.5 0.0 0.000010172526) (let* ((s4-0 (-> (matrix-local->world #f #f) vector 2)) (f0-12 (- 1.5 (* 0.000015258789 (atan (-> s4-0 x) (-> s4-0 z))))) - (f1-1 (+ 0.5 (* -0.5 (-> s4-0 y)))) + (f1-1 (+ 0.5 (/ (-> s4-0 y) -2))) ) (set-vector! (-> arg0 constants2) f0-12 f1-1 1.0 128.0) ) @@ -344,7 +344,7 @@ (let ((f0-28 (* 128.0 (-> *time-of-day-context* ocean-alpha)))) (if (-> *time-of-day-context* sky) (set-vector! (-> arg0 env-color) f0-28 f0-28 f0-28 f0-28) - (set-vector! (-> arg0 env-color) f0-28 f0-28 (* 0.5 f0-28) f0-28) + (set-vector! (-> arg0 env-color) f0-28 f0-28 (/ f0-28 2) f0-28) ) ) (set! (-> arg0 drw2-adgif tag) (new 'static 'gif-tag64 :nloop #x2 :eop #x1 :nreg #x1)) diff --git a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-texture_REF.gc b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-texture_REF.gc index e4eb470ffc..e832bf6e3e 100644 --- a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-texture_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean-texture_REF.gc @@ -597,8 +597,8 @@ ;; WARN: Return type mismatch int vs none. (defmethod ocean-method-84 ((this ocean) (arg0 dma-buffer) (arg1 sky-upload-data) (arg2 vector4w) (arg3 float)) (when (>= (-> arg1 sun 0 pos y) -150.0) - (let* ((f2-0 (* 0.00010050251 (-> arg1 sun 0 pos x))) - (f1-3 (* 0.00010050251 (-> arg1 sun 0 pos z))) + (let* ((f2-0 (/ (-> arg1 sun 0 pos x) 9950)) + (f1-3 (/ (-> arg1 sun 0 pos z) 9950)) (f0-6 (if (< 0.0 (-> arg1 sun 0 pos y)) 1.0 (* 0.006666667 (+ 150.0 (-> arg1 sun 0 pos y))) @@ -773,7 +773,7 @@ (vector--float*! s2-0 arg2 (-> s3-0 sun1-normal) 9.0) (vector--float*! s4-0 arg2 (-> s3-0 moon-normal) 9.0) (vector-float*! s5-0 s5-0 (* (-> s3-0 sun0-scale) f28-0)) - (vector+float*! s5-0 s5-0 s2-0 (* 0.25 f28-0 (-> s3-0 sun1-scale))) + (vector+float*! s5-0 s5-0 s2-0 (* (/ f28-0 4) (-> s3-0 sun1-scale))) (vector+float*! s5-0 s5-0 s4-0 (* (-> s3-0 moon-scale) f28-0)) ) (+! (-> arg0 x) (fmax (fmin (-> s5-0 x) f30-0) (- f30-0))) diff --git a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean_REF.gc b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean_REF.gc index 8e0f351639..2ea5ca5c39 100644 --- a/test/decompiler/reference/jak2/engine/gfx/ocean/ocean_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/ocean/ocean_REF.gc @@ -3,8 +3,8 @@ ;; definition for method 21 of type ocean (defmethod set-corners! ((this ocean) (corner-x float) (corner-z float)) - (let* ((f2-0 (* 0.00008138021 corner-x)) - (f3-0 (* 0.00008138021 corner-z)) + (let* ((f2-0 (/ corner-x (meters 3))) + (f3-0 (/ corner-z (meters 3))) (f0-2 f2-0) (f0-4 (- f0-2 (the float (the int f0-2)))) (f1-6 f3-0) @@ -35,8 +35,8 @@ ((and (-> this heights) *ocean-map*) (let* ((f30-0 (- (-> arg0 x) (-> this start-corner x))) (f28-0 (- (-> arg0 z) (-> this start-corner z))) - (v1-3 (the int (* 0.0000025431316 f30-0))) - (a0-2 (the int (* 0.0000025431316 f28-0))) + (v1-3 (the int (/ f30-0 (meters 96)))) + (a0-2 (the int (/ f28-0 (meters 96)))) (v1-7 (-> this ocean-trans-indices data (+ (* 48 a0-2) v1-3))) ) (cond @@ -47,8 +47,8 @@ ) ) ((begin - (let ((a0-8 (logand (the int (* 0.000010172526 f30-0)) 3)) - (a3-4 (logand (the int (* 0.000010172526 f28-0)) 3)) + (let ((a0-8 (logand (the int (/ f30-0 (meters 24))) 3)) + (a3-4 (logand (the int (/ f28-0 (meters 24))) 3)) (v1-10 (-> this ocean-near-indices data (-> v1-7 child))) ) (set! v1-12 (-> (the-as (pointer int16) (+ (* (+ (* a3-4 4) a0-8) 2) (the-as int v1-10))))) @@ -61,14 +61,12 @@ ) ) (else - (let ((a0-14 (logand (the int (* 0.00008138021 f30-0)) 7))) + (let ((a0-14 (logand (the int (/ f30-0 (meters 3))) 7))) (cond - ((not (logtest? (-> this ocean-mid-masks data v1-12 mask (logand (the int (* 0.00008138021 f28-0)) 7)) - (ash 1 a0-14) - ) + ((not (logtest? (-> this ocean-mid-masks data v1-12 mask (logand (the int (/ f28-0 (meters 3))) 7)) (ash 1 a0-14)) ) (let* ((f1-2 (vector-vector-distance arg0 (math-camera-pos))) - (f26-0 (- 1.0 (fmin 1.0 (* 0.000010172526 f1-2)))) + (f26-0 (- 1.0 (fmin 1.0 (/ f1-2 (meters 24))))) ) (if (-> this ocean-near-translucent?) (+ (* f26-0 (set-corners! this f30-0 f28-0)) (-> this start-corner y)) @@ -1241,7 +1239,7 @@ (vector-! (the-as vector s1-0) v1-5 (-> this start-corner)) ) (vector4-scale! s1-0 s1-0 0.0000025431316) - (set! (-> s3-0 y) (* 0.0000025431316 (-> this start-corner y))) + (set! (-> s3-0 y) (/ (-> this start-corner y) (meters 96))) (.lvf vf16 (&-> this constant quad)) (.lvf vf3 (&-> s2-0 quad)) (.lvf vf4 (&-> s1-0 quad)) diff --git a/test/decompiler/reference/jak2/engine/gfx/sky/sky-tng_REF.gc b/test/decompiler/reference/jak2/engine/gfx/sky/sky-tng_REF.gc index bddea60ee6..013a2a2a3d 100644 --- a/test/decompiler/reference/jak2/engine/gfx/sky/sky-tng_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/sky/sky-tng_REF.gc @@ -206,7 +206,7 @@ (vector--float*! (the-as vector s2-0) arg2 (-> arg3 sun1-normal) 9.0) (vector--float*! (the-as vector s4-0) arg2 (-> arg3 moon-normal) 9.0) (vector4-scale! s5-0 s5-0 (* (-> arg3 sun0-scale) f28-0)) - (vector4-madd! s5-0 s5-0 s2-0 (* 0.25 f28-0 (-> arg3 sun1-scale))) + (vector4-madd! s5-0 s5-0 s2-0 (* (/ f28-0 4) (-> arg3 sun1-scale))) (vector4-madd! s5-0 s5-0 s4-0 (* (-> arg3 moon-scale) f28-0)) (+! (-> arg0 x) (fmax (fmin (-> s5-0 x) f30-0) (- f30-0))) (+! (-> arg0 y) (fmax (fmin (-> s5-0 z) f30-0) (- f30-0))) @@ -251,7 +251,7 @@ (vector4-scale! (the-as vector4 (-> s4-0 sun1-color)) (the-as vector4 (-> this sun1-color)) - (* 0.5 (-> s4-0 sun1-scale)) + (/ (-> s4-0 sun1-scale) 2) ) (vector4-scale! (the-as vector4 (-> s4-0 moon-color)) @@ -434,7 +434,7 @@ (vector4-scale! (the-as vector4 (-> s4-0 sun1-color)) (the-as vector4 (-> this sun1-color)) - (* 0.5 (-> s4-0 sun1-scale)) + (/ (-> s4-0 sun1-scale) 2) ) (vector4-scale! (the-as vector4 (-> s4-0 moon-color)) diff --git a/test/decompiler/reference/jak2/engine/gfx/sprite/particles/sparticle_REF.gc b/test/decompiler/reference/jak2/engine/gfx/sprite/particles/sparticle_REF.gc index e5915f6411..1a2485256f 100644 --- a/test/decompiler/reference/jak2/engine/gfx/sprite/particles/sparticle_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/sprite/particles/sparticle_REF.gc @@ -301,8 +301,8 @@ (set! (-> arg1 radius) f28-0) (let ((f24-0 (sin f26-0)) (f26-1 (cos f26-0)) - (f22-0 (sin (* 0.5 f30-0))) - (f0-5 (cos (* 0.5 f30-0))) + (f22-0 (sin (/ f30-0 2))) + (f0-5 (cos (/ f30-0 2))) (a1-1 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) ) diff --git a/test/decompiler/reference/jak2/engine/gfx/sprite/sprite-distort_REF.gc b/test/decompiler/reference/jak2/engine/gfx/sprite/sprite-distort_REF.gc index f21d1f9cb8..272ca24db7 100644 --- a/test/decompiler/reference/jak2/engine/gfx/sprite/sprite-distort_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/sprite/sprite-distort_REF.gc @@ -58,13 +58,7 @@ (let ((rot (* 65536.0 (/ (the float turn) (the float turns))))) (set-vector! (-> tbls entry entry-idx) (* (sin rot) cam-aspx) (* (cos rot) cam-aspy) 0.0 0.0) (let ((s3-1 (+ entry-idx 1))) - (set-vector! - (-> tbls entry s3-1) - (* 0.001953125 cam-aspx (sin rot)) - (* 0.001953125 cam-aspy (cos rot)) - 0.0 - 0.0 - ) + (set-vector! (-> tbls entry s3-1) (* (/ cam-aspx 512) (sin rot)) (* (/ cam-aspy 512) (cos rot)) 0.0 0.0) (set! entry-idx (+ s3-1 1)) ) ) @@ -73,7 +67,7 @@ ) (set-vector! (-> tbls entry entry-idx) 0.0 cam-aspy 0.0 0.0) (let ((v1-20 (+ entry-idx 1))) - (set-vector! (-> tbls entry v1-20) 0.0 (* 0.001953125 cam-aspy) 0.0 0.0) + (set-vector! (-> tbls entry v1-20) 0.0 (/ cam-aspy 512) 0.0 0.0) (+ v1-20 1) ) ) diff --git a/test/decompiler/reference/jak2/engine/gfx/sprite/sprite-glow_REF.gc b/test/decompiler/reference/jak2/engine/gfx/sprite/sprite-glow_REF.gc index cd93f19156..be92888460 100644 --- a/test/decompiler/reference/jak2/engine/gfx/sprite/sprite-glow_REF.gc +++ b/test/decompiler/reference/jak2/engine/gfx/sprite/sprite-glow_REF.gc @@ -659,7 +659,7 @@ 1.0 ) (else - (let* ((f1-1 (* 0.00024414062 a0-5)) + (let* ((f1-1 (/ a0-5 METER_LENGTH)) (f0-4 (- f1-1 (the float (the int f1-1)))) ) (let ((f1-3 (* 4096.0 (- f1-1 f0-4)))) diff --git a/test/decompiler/reference/jak2/engine/math/math_REF.gc b/test/decompiler/reference/jak2/engine/math/math_REF.gc index c2d9a8c16a..8cc4ced317 100644 --- a/test/decompiler/reference/jak2/engine/math/math_REF.gc +++ b/test/decompiler/reference/jak2/engine/math/math_REF.gc @@ -76,9 +76,7 @@ (* arg0 (+ 0.33333334 (* arg0 - (+ -0.25 - (* arg0 (+ 0.2 (* arg0 (+ -0.16666666 (* arg0 (+ 0.14285715 (* arg0 (+ -0.125 (* 0.11111111 arg0))))))))) - ) + (+ -0.25 (* arg0 (+ 0.2 (* arg0 (+ -0.16666666 (* arg0 (+ 0.14285715 (* arg0 (+ -0.125 (/ arg0 9)))))))))) ) ) ) @@ -106,9 +104,7 @@ (* f0-5 (+ 0.33333334 (* f0-5 - (+ -0.25 - (* f0-5 (+ 0.2 (* f0-5 (+ -0.16666666 (* f0-5 (+ 0.14285715 (* f0-5 (+ -0.125 (* 0.11111111 f0-5))))))))) - ) + (+ -0.25 (* f0-5 (+ 0.2 (* f0-5 (+ -0.16666666 (* f0-5 (+ 0.14285715 (* f0-5 (+ -0.125 (/ f0-5 9)))))))))) ) ) ) @@ -141,9 +137,7 @@ (* f0-5 (+ 0.33333334 (* f0-5 - (+ -0.25 - (* f0-5 (+ 0.2 (* f0-5 (+ -0.16666666 (* f0-5 (+ 0.14285715 (* f0-5 (+ -0.125 (* 0.11111111 f0-5))))))))) - ) + (+ -0.25 (* f0-5 (+ 0.2 (* f0-5 (+ -0.16666666 (* f0-5 (+ 0.14285715 (* f0-5 (+ -0.125 (/ f0-5 9)))))))))) ) ) ) @@ -285,7 +279,7 @@ 0 0 (let* ((f0-1 (* 0.0033333334 (the float arg1))) - (a2-0 (the int (* 0.016666668 f0-1))) + (a2-0 (the int (/ f0-1 60))) (f0-2 (- f0-1 (* 60.0 (the float a2-0)))) (a3-0 (the int f0-2)) (f0-3 (- f0-2 (the float a3-0))) diff --git a/test/decompiler/reference/jak2/engine/math/quaternion_REF.gc b/test/decompiler/reference/jak2/engine/math/quaternion_REF.gc index 88453cd20e..106f8d43da 100644 --- a/test/decompiler/reference/jak2/engine/math/quaternion_REF.gc +++ b/test/decompiler/reference/jak2/engine/math/quaternion_REF.gc @@ -19,7 +19,7 @@ (defun quaternion-axis-angle! ((arg0 quaternion) (arg1 float) (arg2 float) (arg3 float) (arg4 float)) "Construct a quaternion from an axis and angle. The axis should be normalized." (let ((s5-0 (new 'stack-no-clear 'vector))) - (sincos! s5-0 (* 0.5 arg4)) + (sincos! s5-0 (/ arg4 2)) (let ((f0-2 (-> s5-0 x))) (set! (-> arg0 x) (* arg1 f0-2)) (set! (-> arg0 y) (* arg2 f0-2)) @@ -34,7 +34,7 @@ (defun quaternion-vector-angle! ((arg0 quaternion) (arg1 vector) (arg2 float)) "Construct a quaternion from an axis and angle. The axis should be normalized." (let ((s5-0 (new 'stack-no-clear 'vector))) - (sincos! s5-0 (* 0.5 arg2)) + (sincos! s5-0 (/ arg2 2)) (let ((f0-2 (-> s5-0 x))) (set! (-> arg0 x) (* (-> arg1 x) f0-2)) (set! (-> arg0 y) (* (-> arg1 y) f0-2)) @@ -480,7 +480,7 @@ (cond ((< 0.0 f0-2) (let ((f0-4 (sqrtf (+ 1.0 f0-2)))) - (set! (-> arg0 w) (* 0.5 f0-4)) + (set! (-> arg0 w) (/ f0-4 2)) (let ((f0-5 (/ 0.5 f0-4))) (set! (-> arg0 x) (* f0-5 (- (-> arg1 vector 1 z) (-> arg1 vector 2 y)))) (set! (-> arg0 y) (* f0-5 (- (-> arg1 vector 2 x) (-> arg1 vector 0 z)))) @@ -515,7 +515,7 @@ ) ) ) - (set! (-> arg0 data a2-0) (* 0.5 f0-12)) + (set! (-> arg0 data a2-0) (/ f0-12 2)) (if (!= f0-12 0.0) (set! f0-12 (/ 0.5 f0-12)) ) diff --git a/test/decompiler/reference/jak2/engine/math/transformq_REF.gc b/test/decompiler/reference/jak2/engine/math/transformq_REF.gc index 306dd404a6..86728fa030 100644 --- a/test/decompiler/reference/jak2/engine/math/transformq_REF.gc +++ b/test/decompiler/reference/jak2/engine/math/transformq_REF.gc @@ -47,7 +47,7 @@ f30-0 ) (else - (* 0.000000001 f30-0) + (/ f30-0 1000000000) ) ) ) diff --git a/test/decompiler/reference/jak2/engine/physics/dynamics-h_REF.gc b/test/decompiler/reference/jak2/engine/physics/dynamics-h_REF.gc index b5bf70a05a..a0e782ae96 100644 --- a/test/decompiler/reference/jak2/engine/physics/dynamics-h_REF.gc +++ b/test/decompiler/reference/jak2/engine/physics/dynamics-h_REF.gc @@ -45,7 +45,7 @@ ;; definition for function time-to-apex (defun time-to-apex ((arg0 float) (arg1 float)) - (the int (/ arg0 (- (* 0.0033333334 arg1)))) + (the int (/ arg0 (- (/ arg1 300)))) ) ;; definition for function time-to-ground @@ -54,8 +54,8 @@ (v0-0 0) ) (while (< (- arg2) f0-0) - (set! arg0 (- arg0 (* 0.0033333334 arg1))) - (+! f0-0 (* 0.0033333334 arg0)) + (set! arg0 (- arg0 (/ arg1 300))) + (+! f0-0 (/ arg0 300)) (+! v0-0 1) ) v0-0 diff --git a/test/decompiler/reference/jak2/engine/physics/rigid-body_REF.gc b/test/decompiler/reference/jak2/engine/physics/rigid-body_REF.gc index 31677255ec..f3d52e7284 100644 --- a/test/decompiler/reference/jak2/engine/physics/rigid-body_REF.gc +++ b/test/decompiler/reference/jak2/engine/physics/rigid-body_REF.gc @@ -51,7 +51,7 @@ ) (matrix-identity! (-> this inertial-tensor)) (matrix-identity! (-> this inv-inertial-tensor)) - (let ((f0-4 (* 0.083333336 f24-0))) + (let ((f0-4 (/ f24-0 12))) (let* ((f1-1 f30-0) (f1-3 (* f1-1 f1-1)) (f2-0 f26-0) @@ -1515,7 +1515,7 @@ (f0-9 (/ 163840.0 (get-inv-mass a0-38))) ) (vector-reset! (-> this player-force)) - (set! (-> this player-force y) (* -0.1 f0-9 f30-2)) + (set! (-> this player-force y) (* (/ f0-9 -10) f30-2)) ) ) ) diff --git a/test/decompiler/reference/jak2/engine/physics/trajectory_REF.gc b/test/decompiler/reference/jak2/engine/physics/trajectory_REF.gc index 92d6de9b3e..fb6f505d29 100644 --- a/test/decompiler/reference/jak2/engine/physics/trajectory_REF.gc +++ b/test/decompiler/reference/jak2/engine/physics/trajectory_REF.gc @@ -4,7 +4,7 @@ ;; definition for method 9 of type trajectory (defmethod compute-trans-at-time ((this trajectory) (arg0 float) (arg1 vector)) (vector+float*! arg1 (-> this initial-position) (-> this initial-velocity) arg0) - (+! (-> arg1 y) (* 0.5 arg0 arg0 (-> this gravity))) + (+! (-> arg1 y) (* (/ arg0 2) arg0 (-> this gravity))) arg1 ) @@ -32,7 +32,7 @@ (vector-! (-> this initial-velocity) arg1 arg0) (vector-xz-normalize! (-> this initial-velocity) f0-3) ) - (set! (-> this initial-velocity y) (- (/ (- (-> arg1 y) (-> arg0 y)) arg2) (* 0.5 arg2 (-> this gravity)))) + (set! (-> this initial-velocity y) (- (/ (- (-> arg1 y) (-> arg0 y)) arg2) (* (/ arg2 2) (-> this gravity)))) 0 (none) ) diff --git a/test/decompiler/reference/jak2/engine/ps2/timer_REF.gc b/test/decompiler/reference/jak2/engine/ps2/timer_REF.gc index 9af19d5a47..8d61a67d9c 100644 --- a/test/decompiler/reference/jak2/engine/ps2/timer_REF.gc +++ b/test/decompiler/reference/jak2/engine/ps2/timer_REF.gc @@ -160,9 +160,9 @@ ) ) ) - (set! (-> this time-adjust-ratio) (* 0.2 f0-6)) + (set! (-> this time-adjust-ratio) (/ f0-6 5)) ) - (set! (-> this seconds-per-frame) (* 0.016666668 (-> this time-adjust-ratio))) + (set! (-> this seconds-per-frame) (/ (-> this time-adjust-ratio) 60)) (set! (-> this frames-per-second) (if (= (-> this time-adjust-ratio) 0.0) 0.0 (* 60.0 (/ 1.0 (-> this time-adjust-ratio))) diff --git a/test/decompiler/reference/jak2/engine/scene/scene_REF.gc b/test/decompiler/reference/jak2/engine/scene/scene_REF.gc index 996bb43b84..1ab7c9692a 100644 --- a/test/decompiler/reference/jak2/engine/scene/scene_REF.gc +++ b/test/decompiler/reference/jak2/engine/scene/scene_REF.gc @@ -785,7 +785,7 @@ ) (let* ((v1-28 (-> s3-0 base)) (a2-23 - (+ (- 1793 (the-as int (shr (-> arg0 width) 1))) (the int (+ (-> arg1 origin x) (* 0.5 (-> arg1 width))))) + (+ (- 1793 (the-as int (shr (-> arg0 width) 1))) (the int (+ (-> arg1 origin x) (/ (-> arg1 width) 2)))) ) (a3-8 (+ (the int (-> arg1 origin y)) 1841)) (a0-23 (+ a2-23 (-> arg0 width))) @@ -802,7 +802,7 @@ (&+! (-> s3-0 base) 112) (let* ((v1-32 (-> s3-0 base)) (a1-38 - (+ (- 1792 (the-as int (shr (-> arg0 width) 1))) (the int (+ (-> arg1 origin x) (* 0.5 (-> arg1 width))))) + (+ (- 1792 (the-as int (shr (-> arg0 width) 1))) (the int (+ (-> arg1 origin x) (/ (-> arg1 width) 2)))) ) (a3-11 (+ (the int (-> arg1 origin y)) 1840)) (a0-30 (+ a1-38 (-> arg0 width))) diff --git a/test/decompiler/reference/jak2/engine/sound/gsound_REF.gc b/test/decompiler/reference/jak2/engine/sound/gsound_REF.gc index b08b71fc59..bc2d4100fe 100644 --- a/test/decompiler/reference/jak2/engine/sound/gsound_REF.gc +++ b/test/decompiler/reference/jak2/engine/sound/gsound_REF.gc @@ -631,9 +631,9 @@ ) ) ) - (set! (-> arg0 x) (the int (* 0.0625 (-> v1-0 x)))) - (set! (-> arg0 y) (the int (* 0.0625 (-> v1-0 y)))) - (set! (-> arg0 z) (the int (* 0.0625 (-> v1-0 z)))) + (set! (-> arg0 x) (the int (/ (-> v1-0 x) 16))) + (set! (-> arg0 y) (the int (/ (-> v1-0 y) 16))) + (set! (-> arg0 z) (the int (/ (-> v1-0 z) 16))) ) 0 ) @@ -1162,7 +1162,7 @@ ;; definition for method 14 of type ambient-sound ;; WARN: Return type mismatch int vs none. (defmethod set-falloff-far! ((this ambient-sound) (arg0 float)) - (set! (-> this falloff-far) (the int (* 0.00024414062 arg0))) + (set! (-> this falloff-far) (the int (/ arg0 METER_LENGTH))) 0 (none) ) 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 c3e50488ab..dc30cc9423 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 @@ -40,8 +40,8 @@ ) ) (set! (-> self board turn-anim-targ) (+ (lerp-scale - (* 0.5 (-> *TARGET_BOARD-bank* turn-frames)) - (* -0.5 (-> *TARGET_BOARD-bank* turn-frames)) + (/ (-> *TARGET_BOARD-bank* turn-frames) 2) + (/ (-> *TARGET_BOARD-bank* turn-frames) -2) f26-0 -5461.3335 5461.3335 @@ -54,8 +54,8 @@ 32768.0 ) (lerp-scale - (* 0.2 (-> *TARGET_BOARD-bank* turn-frames)) - (* -0.2 (-> *TARGET_BOARD-bank* turn-frames)) + (/ (-> *TARGET_BOARD-bank* turn-frames) 5) + (/ (-> *TARGET_BOARD-bank* turn-frames) -5) (-> self board turn-anim-mag) 1.0 -1.0 @@ -63,7 +63,7 @@ ) ) (when (and (or (< (* f30-0 (-> self board turn-anim-targ)) 0.0) (= f30-0 0.0)) - (and (< (* 0.2 (-> *TARGET_BOARD-bank* turn-frames)) (fabs (- f30-0 (-> self board turn-anim-targ)))) + (and (< (/ (-> *TARGET_BOARD-bank* turn-frames) 5) (fabs (- f30-0 (-> self board turn-anim-targ)))) (>= (current-time) (-> self control turn-lockout-end-time)) ) ) @@ -2210,7 +2210,7 @@ (else (let ((f30-1 (* (lerp-scale 0.7 1.0 (fabs (-> self board ride-lean)) 0.0 1.0) - (lerp-scale 0.8 1.0 (fabs (-> self board ride-speed)) 0.0 (* 0.5 (-> self control mod-surface transv-max))) + (lerp-scale 0.8 1.0 (fabs (-> self board ride-speed)) 0.0 (/ (-> self control mod-surface transv-max) 2)) ) ) (f0-23 diff --git a/test/decompiler/reference/jak2/engine/target/board/target-board_REF.gc b/test/decompiler/reference/jak2/engine/target/board/target-board_REF.gc index 3f33ba8c02..624d923278 100644 --- a/test/decompiler/reference/jak2/engine/target/board/target-board_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/board/target-board_REF.gc @@ -47,7 +47,7 @@ (set! (-> arg0 slope-down-factor) (-> arg1 slope-down-factor)) (set! (-> arg0 seek0) (lerp-scale - (* 0.1 (-> arg0 seek0)) + (/ (-> arg0 seek0) 10) (-> arg0 seek0) (the float (- (current-time) (-> self board spin-time))) 0.0 @@ -56,7 +56,7 @@ ) (set! (-> arg0 seek90) (lerp-scale - (* 0.1 (-> arg0 seek90)) + (/ (-> arg0 seek90) 10) (-> arg0 seek90) (the float (- (current-time) (-> self board spin-time))) 0.0 @@ -72,8 +72,8 @@ (when (not (time-elapsed? (-> self board spin-ground-start-time) (seconds 0.3))) (set-time! (-> self control last-attack-end-time)) (set-time! (-> self board spin-ground-time)) - (set! (-> arg0 seek0) (* 0.1 (-> arg0 seek0))) - (set! (-> arg0 seek90) (* 0.1 (-> arg0 seek90))) + (set! (-> arg0 seek0) (/ (-> arg0 seek0) 10)) + (set! (-> arg0 seek90) (/ (-> arg0 seek90) 10)) (set! (-> arg0 vel-turn) 131072.0) (set! (-> arg0 turnv) 91022.22) ) @@ -1678,7 +1678,7 @@ (< 0.98 (vector-dot (-> self board unknown-vector01) (-> self control standard-dynamics gravity-normal))) (< f26-0 8192.0) (< f30-0 8192.0) - (or (< (* 0.2 f28-0) f30-0) (not (time-elapsed? (-> self board unknown-time-frame00) (seconds 0.1)))) + (or (< (/ f28-0 5) f30-0) (not (time-elapsed? (-> self board unknown-time-frame00) (seconds 0.1)))) ) (vector+float*! (-> self control transv) @@ -1999,7 +1999,7 @@ (set! (-> s2-0 start-pos quad) (-> v1-2 prim-core world-sphere quad)) (set! (-> s2-0 move-dist quad) (-> arg1 quad)) (let ((a0-3 s2-0)) - (set! (-> a0-3 radius) (* 0.5 (-> v1-2 prim-core world-sphere w))) + (set! (-> a0-3 radius) (/ (-> v1-2 prim-core world-sphere w) 2)) (set! (-> a0-3 collide-with) (-> v1-2 prim-core collide-with)) (set! (-> a0-3 ignore-process0) (-> arg0 process)) (set! (-> a0-3 ignore-process1) #f) @@ -2404,7 +2404,7 @@ (let* ((f30-0 (-> self board ride-speed)) (f0-4 (lerp-scale (-> self control current-surface fric) - (* 0.2 (-> self control current-surface fric)) + (/ (-> self control current-surface fric) 5) f30-0 0.0 (-> self control current-surface transv-max) diff --git a/test/decompiler/reference/jak2/engine/target/collide-reaction-target_REF.gc b/test/decompiler/reference/jak2/engine/target/collide-reaction-target_REF.gc index 9b7bcca1d3..1bfae6fbb5 100644 --- a/test/decompiler/reference/jak2/engine/target/collide-reaction-target_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/collide-reaction-target_REF.gc @@ -162,7 +162,7 @@ ) (when (and (or (and (< f0-27 0.95) (>= f30-0 0.0)) (and (logtest? sv-32 (cshape-reaction-flags csrf05)) (< f0-27 0.3)) - (< f1-11 (* -0.25 (-> arg1 best-my-prim local-sphere w))) + (< f1-11 (/ (-> arg1 best-my-prim local-sphere w) -4)) ) (>= (vector-dot tangent contact-normal) -0.000001) ) diff --git a/test/decompiler/reference/jak2/engine/target/gun/gun-yellow-shot_REF.gc b/test/decompiler/reference/jak2/engine/target/gun/gun-yellow-shot_REF.gc index bb49ba5a7a..073b369197 100644 --- a/test/decompiler/reference/jak2/engine/target/gun/gun-yellow-shot_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/gun/gun-yellow-shot_REF.gc @@ -122,7 +122,7 @@ (vector-normalize! s5-1 1.0) (launch-particles (-> *part-id-table* 224) gp-0) (let ((s3-0 (new 'stack-no-clear 'matrix)) - (f28-1 (* 0.000015258789 f30-0)) + (f28-1 (/ f30-0 (meters 16))) (f30-1 (-> *part-id-table* 226 init-specs 3 initial-valuef)) ) (forward-up->inv-matrix s3-0 s5-1 *up-vector*) diff --git a/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc b/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc index c44ee51d70..752b3a6105 100644 --- a/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc @@ -622,7 +622,7 @@ (set! f2-0 (-> a1-3 a2-6 w)) ) ) - (let ((f1-1 (* 0.0625 f1-0))) + (let ((f1-1 (/ f1-0 16))) (set! (-> self control idx-of-fastest-xz-vel) a0-3) (set! (-> self control average-xz-vel) f1-1) (if (logtest? (-> self control current-surface flags) (surface-flag no-turn-around)) diff --git a/test/decompiler/reference/jak2/engine/target/mech/mech-part_REF.gc b/test/decompiler/reference/jak2/engine/target/mech/mech-part_REF.gc index 7480702431..ef46d1d060 100644 --- a/test/decompiler/reference/jak2/engine/target/mech/mech-part_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/mech/mech-part_REF.gc @@ -158,7 +158,7 @@ (quaternion-rotate-local-x! s1-0 s1-0 32768.0) (let ((a0-3 s0-0)) (let ((v1-10 arg1)) - (let ((a1-4 (* 0.5 arg4))) + (let ((a1-4 (/ arg4 2))) (.mov vf7 a1-4) ) (.lvf vf5 (&-> arg2 quad)) 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 0c56e56825..7977192d6d 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 @@ -798,7 +798,7 @@ (else (seek! (-> self mech jump-thrust) 0.0 (* 491520.0 (seconds-per-frame))) (set! (-> self mech thruster-flame-width) (* 0.021428572 (-> self mech jump-thrust))) - (set! (-> self mech thruster-flame-length) (* 0.028571429 (-> self mech jump-thrust))) + (set! (-> self mech thruster-flame-length) (/ (-> self mech jump-thrust) 35)) ) ) ) @@ -1323,7 +1323,7 @@ (dotimes (s4-0 1) ((method-of-type sphere new) (the-as symbol (+ (the-as uint s5-0) (* s4-0 16))) sphere) ) - (let ((f30-0 (seek (-> self control collide-mode-transition) 1.0 (* 0.1 (-> self clock time-adjust-ratio))))) + (let ((f30-0 (seek (-> self control collide-mode-transition) 1.0 (/ (-> self clock time-adjust-ratio) 10)))) (set! (-> (the-as sphere (&-> s5-0 x)) quad) (-> self control collision-spheres 2 prim-core world-sphere quad) ) @@ -2164,7 +2164,7 @@ (* 491520.0 (seconds-per-frame)) ) (set! (-> self mech thruster-flame-width) (* 0.021428572 (-> self mech jump-thrust))) - (set! (-> self mech thruster-flame-length) (* 0.028571429 (-> self mech jump-thrust))) + (set! (-> self mech thruster-flame-length) (/ (-> self mech jump-thrust) 35)) (let ((v1-120 (ja-group))) (if (and v1-120 (or (= v1-120 jakb-mech-push-ja) (= v1-120 jakb-mech-pull-ja))) (ja :num! (loop! f26-1)) diff --git a/test/decompiler/reference/jak2/engine/target/surface-h_REF.gc b/test/decompiler/reference/jak2/engine/target/surface-h_REF.gc index 5076adc16f..3472804086 100644 --- a/test/decompiler/reference/jak2/engine/target/surface-h_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/surface-h_REF.gc @@ -190,19 +190,19 @@ on impact, during touch, on exit, etc." ;; definition for function calc-terminal-vel (defun calc-terminal-vel ((arg0 float) (arg1 float) (arg2 float)) - (- (* (/ (- (* 0.016666668 arg0) arg1) arg2) (- 1.0 arg2)) arg1) + (- (* (/ (- (/ arg0 60) arg1) arg2) (- 1.0 arg2)) arg1) ) ;; definition for function calc-terminal2-vel (defun calc-terminal2-vel ((arg0 float) (arg1 float) (arg2 float) (arg3 float)) - (let ((f0-4 (sqrtf (/ (- (* 0.016666668 arg0) arg1) arg2)))) + (let ((f0-4 (sqrtf (/ (- (/ arg0 60) arg1) arg2)))) (- f0-4 (+ arg1 (* arg2 (* f0-4 f0-4)))) ) ) ;; definition for function calc-terminal4-vel (defun calc-terminal4-vel ((arg0 float) (arg1 float) (arg2 float)) - (let ((f0-5 (sqrtf (sqrtf (/ (- (* 0.016666668 arg0) arg1) arg2))))) + (let ((f0-5 (sqrtf (sqrtf (/ (- (/ arg0 60) arg1) arg2))))) (- f0-5 (+ arg1 (* arg2 (* f0-5 f0-5 f0-5 f0-5)))) ) ) 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 6ef41ac71b..5ef8c403bc 100644 --- a/test/decompiler/reference/jak2/engine/target/target-anim_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-anim_REF.gc @@ -674,7 +674,7 @@ ) ((lambda :behavior target () - (let ((f30-0 (fmax 0.8 (fmin 1.0 (* 0.000048828126 (-> self control ctrl-xz-vel)))))) + (let ((f30-0 (fmax 0.8 (fmin 1.0 (/ (-> self control ctrl-xz-vel) (meters 5)))))) (cond ((and (rand-vu-percent? 0.3) (< 20480.0 (-> self control ctrl-xz-vel))) (ja-no-eval :group! jakb-attack-from-stance-alt-end-ja :num! (seek! (ja-aframe 29.0 0) f30-0) :frame-num 0.0) @@ -1031,10 +1031,10 @@ ) ) (let ((f0-37 (fabs (- f20-0 f30-0)))) - (set! f30-0 (seek f30-0 f20-0 (fmax 0.05 (fmin 0.2 (* 0.25 f0-37))))) + (set! f30-0 (seek f30-0 f20-0 (fmax 0.05 (fmin 0.2 (/ f0-37 4))))) ) (let ((f0-42 (fabs (- f22-1 f28-0)))) - (set! f28-0 (seek f28-0 f22-1 (fmax 0.05 (fmin 0.2 (* 0.25 f0-42))))) + (set! f28-0 (seek f28-0 f22-1 (fmax 0.05 (fmin 0.2 (/ f0-42 4))))) ) ) (set! (-> self control unknown-float-n12iuh3n1) f30-0) @@ -1572,7 +1572,7 @@ (let ((f0-11 (target-height-above-ground)) (f1-1 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) ) - (while (not (or (and (< (fabs (/ f0-11 (* 0.0033333334 f1-1))) 150.0) (< f1-1 0.0)) + (while (not (or (and (< (fabs (/ f0-11 (/ f1-1 300))) 150.0) (< f1-1 0.0)) (time-elapsed? (-> self state-time) (seconds 1.7)) ) ) diff --git a/test/decompiler/reference/jak2/engine/target/target-carry_REF.gc b/test/decompiler/reference/jak2/engine/target/target-carry_REF.gc index 23a3e1273a..28c96806bc 100644 --- a/test/decompiler/reference/jak2/engine/target/target-carry_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-carry_REF.gc @@ -80,7 +80,7 @@ (dotimes (s4-0 1) ((method-of-type sphere new) (the-as symbol (-> s5-0 s4-0)) sphere) ) - (let ((f30-0 (seek (-> self control collide-mode-transition) 1.0 (* 0.1 (-> self clock time-adjust-ratio))))) + (let ((f30-0 (seek (-> self control collide-mode-transition) 1.0 (/ (-> self clock time-adjust-ratio) 10)))) (set! (-> s5-0 0 quad) (-> self control collision-spheres 2 prim-core world-sphere quad)) (set! (-> s5-0 0 r) (lerp-scale (-> *TARGET-bank* body-radius) 7372.8 f30-0 0.0 1.0)) (let ((v1-17 gp-0)) diff --git a/test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc b/test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc index 76987cb849..d98b11b35f 100644 --- a/test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc @@ -603,7 +603,7 @@ (set-setting! 'rapid-tracking #f 0.0 0) ((lambda :behavior target () - (set! (-> self control bend-target) (* 0.5 (-> self control bend-target))) + (set! (-> self control bend-target) (/ (-> self control bend-target) 2)) (if (logtest? (water-flags touch-water) (-> self water flags)) (sound-play "swim-stroke") ) @@ -1943,7 +1943,3 @@ ) :post (-> target-grab post) ) - - - - diff --git a/test/decompiler/reference/jak2/engine/target/target-death_REF.gc b/test/decompiler/reference/jak2/engine/target/target-death_REF.gc index b155054831..789a2fe35d 100644 --- a/test/decompiler/reference/jak2/engine/target/target-death_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-death_REF.gc @@ -981,7 +981,7 @@ (set! (-> sv-32 vector y) (-> sv-32 shove-up)) ) (when (and (focus-test? self dark) (nonzero? (-> self darkjak))) - (set! (-> sv-32 damage) (fmax 1.0 (ceil (* 0.5 (-> sv-32 damage))))) + (set! (-> sv-32 damage) (fmax 1.0 (ceil (/ (-> sv-32 damage) 2)))) (if (< (- (-> self fact health) (-> sv-32 damage)) 1.0) (set! (-> sv-32 damage) (+ -1.0 (-> self fact health))) ) diff --git a/test/decompiler/reference/jak2/engine/target/target-gun_REF.gc b/test/decompiler/reference/jak2/engine/target/target-gun_REF.gc index dfae2a9332..127f8e1e39 100644 --- a/test/decompiler/reference/jak2/engine/target/target-gun_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-gun_REF.gc @@ -1659,7 +1659,7 @@ (dotimes (s4-1 1) ((method-of-type sphere new) (the-as symbol (-> s5-2 s4-1)) sphere) ) - (let ((f30-1 (seek (-> self control collide-mode-transition) 1.0 (* 0.1 (-> self clock time-adjust-ratio))))) + (let ((f30-1 (seek (-> self control collide-mode-transition) 1.0 (/ (-> self clock time-adjust-ratio) 10)))) (set! (-> s5-2 0 quad) (-> self control collision-spheres 2 prim-core world-sphere quad)) (set! (-> s5-2 0 r) (lerp-scale (-> *TARGET-bank* body-radius) 7372.8 f30-1 0.0 1.0)) (let ((v1-212 gp-3)) @@ -1748,7 +1748,7 @@ (let* ((f0-28 (deg-diff (y-angle (-> self control)) (vector-y-angle (-> self control to-target-pt-xz)))) (f0-30 (fmax -5461.3335 (fmin 5461.3335 f0-28))) ) - (seek! (-> self upper-body twist z) f0-30 (fabs (* 0.2 f0-30))) + (seek! (-> self upper-body twist z) f0-30 (fabs (/ f0-30 5))) ) ) ) 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 b9998230a1..4a9b553b30 100644 --- a/test/decompiler/reference/jak2/engine/target/target-swim_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-swim_REF.gc @@ -187,10 +187,10 @@ (f24-0 (fmax -1.0 (fmin 1.0 (* 1.6 (-> self control local-slope-x))))) ) (let ((f1-4 (fabs (- f0-10 f28-0)))) - (set! f28-0 (seek f28-0 f0-10 (fmax 0.05 (fmin 0.2 (* 0.25 f1-4))))) + (set! f28-0 (seek f28-0 f0-10 (fmax 0.05 (fmin 0.2 (/ f1-4 4))))) ) (let ((f0-14 (fabs (- f24-0 f26-0)))) - (set! f26-0 (seek f26-0 f24-0 (fmax 0.05 (fmin 0.2 (* 0.25 f0-14))))) + (set! f26-0 (seek f26-0 f24-0 (fmax 0.05 (fmin 0.2 (/ f0-14 4))))) ) ) (ja :chan 3 :group! jakb-walk-down-ja :dist (-> *TARGET-bank* walk-down-cycle-dist)) diff --git a/test/decompiler/reference/jak2/engine/target/target-tube_REF.gc b/test/decompiler/reference/jak2/engine/target/target-tube_REF.gc index 71a27dade5..77902b175b 100644 --- a/test/decompiler/reference/jak2/engine/target/target-tube_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-tube_REF.gc @@ -862,7 +862,7 @@ (f2-0 f1-2) ) (if (< f0-2 0.0) - (set! f0-2 (* 0.5 f0-2)) + (set! f0-2 (/ f0-2 2)) ) (vector+! (-> arg1 vector) diff --git a/test/decompiler/reference/jak2/engine/target/target-turret-shot_REF.gc b/test/decompiler/reference/jak2/engine/target/target-turret-shot_REF.gc index 4755c94e32..f75833ce8c 100644 --- a/test/decompiler/reference/jak2/engine/target/target-turret-shot_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-turret-shot_REF.gc @@ -293,7 +293,7 @@ (launch-particles (-> *part-id-table* 608) s4-0) ) (let ((s4-1 (new 'stack-no-clear 'matrix)) - (f26-0 (* 0.000027126736 f30-0)) + (f26-0 (/ f30-0 (meters 9))) (f30-1 (-> *part-id-table* 923 init-specs 3 initial-valuef)) (f28-1 (-> *part-id-table* 923 init-specs 4 initial-valuef)) ) 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 51d2329178..eb1559192e 100644 --- a/test/decompiler/reference/jak2/engine/target/target-turret_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-turret_REF.gc @@ -408,7 +408,7 @@ ) ) (set! (-> this sprites 28 color w) - (the int (* 0.00390625 (-> this fade-interp) (the float (-> this values 2 current)))) + (the int (* (/ (-> this fade-interp) 256) (the float (-> this values 2 current)))) ) (set-as-offset-from! (-> this sprites 28) 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 ba5246a15c..21975fa2cb 100644 --- a/test/decompiler/reference/jak2/engine/target/target-util_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-util_REF.gc @@ -1208,7 +1208,7 @@ ) ) ) - (* 0.125 f30-0) + (/ f30-0 8) ) ) @@ -1890,10 +1890,10 @@ (f30-0 (fmax -1.0 (fmin 1.0 arg2))) ) (let ((f1-5 (fabs (- f0-1 (-> arg0 blend 1))))) - (seek! (-> arg0 blend 1) f0-1 (fmax (fmin (* f1-5 arg3) (* 0.8 arg3)) (* 0.2 arg3))) + (seek! (-> arg0 blend 1) f0-1 (fmax (fmin (* f1-5 arg3) (* 0.8 arg3)) (/ arg3 5))) ) (let ((f0-9 (fabs (- f30-0 (-> arg0 blend 2))))) - (seek! (-> arg0 blend 2) f30-0 (fmax (fmin (* f0-9 arg3) (* 0.8 arg3)) (* 0.2 arg3))) + (seek! (-> arg0 blend 2) f30-0 (fmax (fmin (* f0-9 arg3) (* 0.8 arg3)) (/ arg3 5))) ) ) (cond @@ -2073,8 +2073,8 @@ (cond ((and (< 0.0 f0-4) (focus-test? this in-air)) (let* ((v0-1 (new 'static 'vector)) - (f0-5 (+ (* 0.0016666667 (-> v1-0 dynam gravity-length)) f0-4)) - (f0-8 (/ (* 0.5 f0-5 f0-5) (-> v1-0 dynam gravity-length))) + (f0-5 (+ (/ (-> v1-0 dynam gravity-length) 600) f0-4)) + (f0-8 (/ (* (/ f0-5 2) f0-5) (-> v1-0 dynam gravity-length))) ) (vector+float*! v0-1 (-> v1-0 trans) (-> v1-0 dynam gravity-normal) f0-8) ) diff --git a/test/decompiler/reference/jak2/engine/target/target2_REF.gc b/test/decompiler/reference/jak2/engine/target/target2_REF.gc index 9634b554da..4e2ef08d92 100644 --- a/test/decompiler/reference/jak2/engine/target/target2_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target2_REF.gc @@ -658,7 +658,7 @@ (let ((f0-1 (target-height-above-ground)) (f1-1 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) ) - (while (not (and (< (fabs (/ f0-1 (* 0.0033333334 f1-1))) 40.0) (and (< f1-1 0.0) (ja-min? 0)))) + (while (not (and (< (fabs (/ f0-1 (/ f1-1 300))) 40.0) (and (< f1-1 0.0) (ja-min? 0)))) (suspend) (ja :num! (loop!)) (set! f0-1 (target-height-above-ground)) diff --git a/test/decompiler/reference/jak2/engine/target/target_REF.gc b/test/decompiler/reference/jak2/engine/target/target_REF.gc index d5ebe17912..035bef6074 100644 --- a/test/decompiler/reference/jak2/engine/target/target_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target_REF.gc @@ -564,11 +564,11 @@ (delete-back-vel) (let* ((f0-4 arg5) (f1-2 0.0) - (f2-2 (+ (* 0.0016666667 (-> self control dynam gravity-length)) + (f2-2 (+ (/ (-> self control dynam gravity-length) 600) (fmax 0.0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv))) ) ) - (f0-5 (* f0-4 (fmax f1-2 (/ (* 0.5 f2-2 f2-2) (-> self control dynam gravity-length))))) + (f0-5 (* f0-4 (fmax f1-2 (/ (* (/ f2-2 2) f2-2) (-> self control dynam gravity-length))))) (s3-1 (+ arg0 f0-5)) ) (let ((s2-1 (+ arg1 f0-5))) @@ -698,7 +698,7 @@ (nonzero? (-> self darkjak)) (logtest? (-> self darkjak stage) (darkjak-stage giant)) ) - (set! (-> v1-62 y) (* 0.5 (-> v1-62 y))) + (set! (-> v1-62 y) (/ (-> v1-62 y) 2)) ) (set! v0-1 (-> self control anim-collide-offset-local)) (set! (-> v0-1 quad) (-> v1-62 quad)) @@ -2772,7 +2772,7 @@ ) (else (let* ((f1-5 (/ f0-2 (* (-> self control dynam gravity-length) (seconds-per-frame)))) - (f0-7 (* 0.5 f1-5 (seconds-per-frame) f0-2)) + (f0-7 (* (/ f1-5 2) (seconds-per-frame) f0-2)) ) (let ((v1-22 (ja-group))) (if (and v1-22 diff --git a/test/decompiler/reference/jak2/engine/ui/bigmap_REF.gc b/test/decompiler/reference/jak2/engine/ui/bigmap_REF.gc index 967d5cb64d..1006b182d2 100644 --- a/test/decompiler/reference/jak2/engine/ui/bigmap_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/bigmap_REF.gc @@ -400,8 +400,8 @@ (let ((f1-2 (* 20.0 f1-0 f0-0)) (f0-1 (* 20.0 f0-0)) ) - (set! (-> a0-23 x) (the float (the int (- (-> a2-1 x) (* 0.5 f1-2))))) - (set! (-> a0-23 y) (the float (the int (- (-> a2-1 y) (* 0.5 f0-1))))) + (set! (-> a0-23 x) (the float (the int (- (-> a2-1 x) (/ f1-2 2))))) + (set! (-> a0-23 y) (the float (the int (- (-> a2-1 y) (/ f0-1 2))))) (set! (-> v1-21 x) (+ (-> a0-23 x) f1-2)) (set! (-> v1-21 y) (+ (-> a0-23 y) f0-1)) ) diff --git a/test/decompiler/reference/jak2/engine/ui/hud_REF.gc b/test/decompiler/reference/jak2/engine/ui/hud_REF.gc index 579af88ad3..1cee353ee0 100644 --- a/test/decompiler/reference/jak2/engine/ui/hud_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/hud_REF.gc @@ -1249,7 +1249,7 @@ :code (behavior () (until #f (if (not (logtest? (-> *kernel-context* prevent-from-run) (process-mask pause))) - (seek! (-> self offset) 0.0 (* 0.1 (-> self clock time-adjust-ratio))) + (seek! (-> self offset) 0.0 (/ (-> self clock time-adjust-ratio) 10)) ) (if (>= 0.0 (-> self offset)) (go hud-in) @@ -1499,7 +1499,3 @@ 0 (none) ) - - - - diff --git a/test/decompiler/reference/jak2/engine/ui/minimap_REF.gc b/test/decompiler/reference/jak2/engine/ui/minimap_REF.gc index bff78bba32..5ee117a2b4 100644 --- a/test/decompiler/reference/jak2/engine/ui/minimap_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/minimap_REF.gc @@ -1399,7 +1399,7 @@ (set! (-> this target-inv-scale) 0.5) ) ) - (seek! (-> this offset y) (-> this target-inv-scale) (* 0.5 f30-2)) + (seek! (-> this offset y) (-> this target-inv-scale) (/ f30-2 2)) ) (run-pending-updates! (-> this engine) (-> *display* base-clock frame-counter)) (when (and (-> this ctywide) (and (= (-> this ctywide status) 'active) (!= (-> this offset w) 0.0))) @@ -1992,23 +1992,23 @@ (set-vector! (-> arg0 mat vector 2) (* (-> s1-0 x) f30-0) 0.0 (-> s1-0 z) 0.0) ) (vector-! s2-0 (target-pos 0) (-> this minimap-corner)) - (set! (-> s2-0 x) (* 0.00000023841858 (-> s2-0 x))) - (set! (-> s2-0 z) (* 0.00000023841858 (-> s2-0 z))) + (set! (-> s2-0 x) (/ (-> s2-0 x) (meters 1024))) + (set! (-> s2-0 z) (/ (-> s2-0 z) (meters 1024))) (vector+! (-> arg0 mat trans) s2-0 (-> this offset)) ) ) (set! (-> arg0 mat trans y) 0.0) - (set! (-> arg0 corner 0 x) (* 0.25 (-> this offset y))) - (set! (-> arg0 corner 0 z) (* 0.25 (-> this offset y))) + (set! (-> arg0 corner 0 x) (/ (-> this offset y) 4)) + (set! (-> arg0 corner 0 z) (/ (-> this offset y) 4)) (set! (-> arg0 corner 0 w) 1.0) - (set! (-> arg0 corner 1 x) (* -0.25 (-> this offset y))) - (set! (-> arg0 corner 1 z) (* 0.25 (-> this offset y))) + (set! (-> arg0 corner 1 x) (/ (-> this offset y) -4)) + (set! (-> arg0 corner 1 z) (/ (-> this offset y) 4)) (set! (-> arg0 corner 1 w) 1.0) - (set! (-> arg0 corner 2 x) (* 0.25 (-> this offset y))) - (set! (-> arg0 corner 2 z) (* -0.25 (-> this offset y))) + (set! (-> arg0 corner 2 x) (/ (-> this offset y) 4)) + (set! (-> arg0 corner 2 z) (/ (-> this offset y) -4)) (set! (-> arg0 corner 2 w) 1.0) - (set! (-> arg0 corner 3 x) (* -0.25 (-> this offset y))) - (set! (-> arg0 corner 3 z) (* -0.25 (-> this offset y))) + (set! (-> arg0 corner 3 x) (/ (-> this offset y) -4)) + (set! (-> arg0 corner 3 z) (/ (-> this offset y) -4)) (set! (-> arg0 corner 3 w) 1.0) (vector-matrix*! (the-as vector (-> arg0 corner)) (the-as vector (-> arg0 corner)) (-> arg0 mat)) (vector-matrix*! (-> arg0 corner 1) (-> arg0 corner 1) (-> arg0 mat)) @@ -2516,8 +2516,8 @@ (let ((f1-16 (* 20.0 (-> *video-params* relative-x-scale) f0-48)) (f0-49 (* 20.0 f0-48)) ) - (set! (-> arg0 corner 0 x) (the float (the int (- (-> s3-2 x) (* 0.5 f1-16))))) - (set! (-> arg0 corner 0 z) (the float (the int (- (-> s3-2 z) (* 0.5 f0-49))))) + (set! (-> arg0 corner 0 x) (the float (the int (- (-> s3-2 x) (/ f1-16 2))))) + (set! (-> arg0 corner 0 z) (the float (the int (- (-> s3-2 z) (/ f0-49 2))))) (set! (-> arg0 corner 1 x) (+ (-> arg0 corner 0 x) f1-16)) (set! (-> arg0 corner 1 z) (+ (-> arg0 corner 0 z) f0-49)) ) diff --git a/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc b/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc index 2d0635a59e..39a63200bf 100644 --- a/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc @@ -5256,7 +5256,7 @@ 0 0 0 - (let* ((minutes (the int (* 0.016666668 time))) + (let* ((minutes (the int (/ time 60))) (remainder-minutes (- time (* 60.0 (the float minutes)))) (seconds (the int remainder-minutes)) (remainder-seconds (- remainder-minutes (the float seconds))) diff --git a/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc b/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc index d7d0776160..16b5a85e04 100644 --- a/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc @@ -1167,14 +1167,14 @@ (seek-ease (-> self menu-transition) 0.0 - (* 0.1 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 10) 0.4 - (* 0.01 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 100) ) ) ) (else - (seek! (-> self menu-transition) 1.0 (* 0.1 (-> self clock time-adjust-ratio))) + (seek! (-> self menu-transition) 1.0 (/ (-> self clock time-adjust-ratio) 10)) (when (and (= (-> self menu-transition) 1.0) (or (and (nonzero? (-> self state-pos)) (= (-> self anim-frame) 1.0)) (or (and (zero? (-> self state-pos)) (= (-> self anim-frame) 0.0)) @@ -1215,12 +1215,12 @@ (if (= (-> self ring-angle) (-> self ring-want-angle)) (respond-to-cpad self) ) - (let ((f30-0 (* 0.005 (-> self clock time-adjust-ratio)))) + (let ((f30-0 (/ (-> self clock time-adjust-ratio) 200))) (cond ((= (-> self menu-transition) 1.0) (if (and (zero? (-> self state-pos)) (= (-> *progress-state* starting-state) 'main)) - (seek! (-> self anim-frame) 0.0 (* 0.02 (-> self clock time-adjust-ratio))) - (seek! (-> self anim-frame) 1.0 (* 0.02 (-> self clock time-adjust-ratio))) + (seek! (-> self anim-frame) 0.0 (/ (-> self clock time-adjust-ratio) 50)) + (seek! (-> self anim-frame) 1.0 (/ (-> self clock time-adjust-ratio) 50)) ) (let ((f0-27 (if (and (zero? (-> self state-pos)) (!= (-> *progress-state* starting-state) 'title)) 0.0 @@ -1230,14 +1230,14 @@ ) (when (= (-> self next) 'bigmap) (set! f0-27 0.4) - (set! f30-0 (* 0.008 (-> self clock time-adjust-ratio))) + (set! f30-0 (/ (-> self clock time-adjust-ratio) 125)) ) (seek! (-> self pos-transition) f0-27 f30-0) ) ) ((zero? (-> self state-pos)) (if (= (-> self current) 'bigmap) - (set! f30-0 (* 0.05 (-> self clock time-adjust-ratio))) + (set! f30-0 (/ (-> self clock time-adjust-ratio) 20)) ) (if (!= (-> *progress-state* starting-state) 'title) (seek! (-> self pos-transition) 0.0 f30-0) @@ -1288,9 +1288,9 @@ (set! (-> self swing) (seek-ease (-> self swing) 4.0 - (* 0.05 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 20) 0.5 - (* 0.005 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 200) ) ) (set! (-> self swing) (seek-ease @@ -1464,9 +1464,9 @@ (set! (-> self scanlines-alpha) (seek-ease (-> self scanlines-alpha) (- 1.0 (-> self menu-transition)) - (* 0.05 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 20) 0.3 - (* 0.001 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 1000) ) ) (end-scan sv-152 (-> self scanlines-alpha)) @@ -1769,16 +1769,16 @@ ) ) :trans (behavior () - (seek! (-> self anim-frame) 0.0 (* 0.02 (-> self clock time-adjust-ratio))) + (seek! (-> self anim-frame) 0.0 (/ (-> self clock time-adjust-ratio) 50)) (cond ((= (-> self anim-frame) 0.0) - (seek! (-> self pos-transition) 1.0 (* 0.02 (-> self clock time-adjust-ratio))) + (seek! (-> self pos-transition) 1.0 (/ (-> self clock time-adjust-ratio) 50)) (if (= (-> self pos-transition) 1.0) (go-virtual gone) ) ) (else - (seek! (-> self pos-transition) 0.0 (* 0.02 (-> self clock time-adjust-ratio))) + (seek! (-> self pos-transition) 0.0 (/ (-> self clock time-adjust-ratio) 50)) ) ) (set-ring-position self) @@ -1926,13 +1926,13 @@ (arg1 (cond ((cpad-hold? 0 left l-analog-left) - (seek! (-> (the-as (pointer float) gp-0)) 0.0 (* 0.02 (-> self clock time-adjust-ratio))) + (seek! (-> (the-as (pointer float) gp-0)) 0.0 (/ (-> self clock time-adjust-ratio) 50)) (if (!= (-> (the-as (pointer float) gp-0)) 0.0) (set! s4-0 #t) ) ) ((cpad-hold? 0 right l-analog-right) - (seek! (-> (the-as (pointer float) gp-0)) 1.0 (* 0.02 (-> self clock time-adjust-ratio))) + (seek! (-> (the-as (pointer float) gp-0)) 1.0 (/ (-> self clock time-adjust-ratio) 50)) (if (!= (-> (the-as (pointer float) gp-0)) 1.0) (set! s4-0 #t) ) @@ -1945,13 +1945,13 @@ (else (cond ((cpad-hold? 0 left l-analog-left) - (seek! (-> (the-as (pointer float) gp-0)) 0.0 (* 0.02 (-> self clock time-adjust-ratio))) + (seek! (-> (the-as (pointer float) gp-0)) 0.0 (/ (-> self clock time-adjust-ratio) 50)) (if (!= (-> (the-as (pointer float) gp-0)) 0.0) (set! s4-0 #t) ) ) ((cpad-hold? 0 right l-analog-right) - (seek! (-> (the-as (pointer float) gp-0)) 1.0 (* 0.02 (-> self clock time-adjust-ratio))) + (seek! (-> (the-as (pointer float) gp-0)) 1.0 (/ (-> self clock time-adjust-ratio) 50)) (if (!= (-> (the-as (pointer float) gp-0)) 1.0) (set! s4-0 #t) ) @@ -2952,9 +2952,9 @@ (set! (-> arg0 sliding-height) (seek-ease (-> arg0 sliding-height) 0.0 - (* 0.1 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 10) 0.3 - (* 0.001 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 1000) ) ) (let ((s4-0 #f)) @@ -3048,9 +3048,9 @@ (set! (-> arg0 sliding-height) (seek-ease (-> arg0 sliding-height) 0.0 - (* 0.1 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 10) 0.3 - (* 0.01 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 100) ) ) (let ((gp-0 #f)) @@ -3133,9 +3133,9 @@ (set! (-> arg0 sliding-height) (seek-ease (-> arg0 sliding-height) 0.0 - (* 0.1 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 10) 0.3 - (* 0.01 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 100) ) ) (let ((s5-0 #f)) @@ -3183,17 +3183,17 @@ (set! (-> progress sliding) (seek-ease (-> progress sliding) 0.0 - (* 0.1 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 10) 0.3 - (* 0.001 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 1000) ) ) (set! (-> progress sliding-off) (seek-ease (-> progress sliding-off) 1.0 - (* 0.1 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 10) -0.3 - (* 0.001 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 1000) ) ) (when (-> *bigmap* progress-minimap) @@ -3263,9 +3263,9 @@ (set! (-> arg0 sliding) (seek-ease (-> arg0 sliding) 0.0 - (* 0.1 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 10) 0.3 - (* 0.001 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 1000) ) ) (cond diff --git a/test/decompiler/reference/jak2/engine/ui/text_REF.gc b/test/decompiler/reference/jak2/engine/ui/text_REF.gc index 0b12a53ed5..8fb2d6b56c 100644 --- a/test/decompiler/reference/jak2/engine/ui/text_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/text_REF.gc @@ -536,7 +536,7 @@ ) (set! sv-64 0) (if (logtest? (-> arg1 flags) (font-flags middle)) - (+! (-> arg1 origin x) (* 0.5 (-> arg1 width))) + (+! (-> arg1 origin x) (/ (-> arg1 width) 2)) ) (set! sv-72 (-> sv-32 0)) (set! sv-80 0) diff --git a/test/decompiler/reference/jak2/engine/util/smush-control-h_REF.gc b/test/decompiler/reference/jak2/engine/util/smush-control-h_REF.gc index 9db8845c5e..d1debffb5c 100644 --- a/test/decompiler/reference/jak2/engine/util/smush-control-h_REF.gc +++ b/test/decompiler/reference/jak2/engine/util/smush-control-h_REF.gc @@ -123,7 +123,7 @@ (damp-period float) (clock clock) ) - (when (>= (fabs (* 0.2 (-> this amp))) (fabs (get-no-update this))) + (when (>= (fabs (/ (-> this amp) 5)) (fabs (get-no-update this))) (set! (-> this amp) amplitude) (set! (-> this period) (the float period)) (set! (-> this duration) (the float duration)) diff --git a/test/decompiler/reference/jak2/engine/util/sync-info_REF.gc b/test/decompiler/reference/jak2/engine/util/sync-info_REF.gc index 7aa6430bfe..492b12031e 100644 --- a/test/decompiler/reference/jak2/engine/util/sync-info_REF.gc +++ b/test/decompiler/reference/jak2/engine/util/sync-info_REF.gc @@ -440,7 +440,7 @@ (defmethod set-params! ((this delayed-rand-float) (arg0 int) (arg1 int) (arg2 float)) (set! (-> this min-time) arg0) (set! (-> this max-time) arg1) - (set! (-> this max-val) (* 0.5 arg2)) + (set! (-> this max-val) (/ arg2 2)) (set! (-> this start-time) 0) (set! (-> this timer) 0) (set! (-> this value) 0.0) @@ -550,8 +550,8 @@ (defmethod set-params! ((this delayed-rand-vector) (arg0 int) (arg1 int) (arg2 float) (arg3 float)) (set! (-> this min-time) arg0) (set! (-> this max-time) arg1) - (set! (-> this xz-max) (* 0.5 arg2)) - (set! (-> this y-max) (* 0.5 arg3)) + (set! (-> this xz-max) (/ arg2 2)) + (set! (-> this y-max) (/ arg3 2)) (set! (-> this start-time) 0) (set! (-> this timer) 0) (vector-reset! (-> this value)) diff --git a/test/decompiler/reference/jak2/kernel/gstring_REF.gc b/test/decompiler/reference/jak2/kernel/gstring_REF.gc index eab4c942f1..0bed39b62a 100644 --- a/test/decompiler/reference/jak2/kernel/gstring_REF.gc +++ b/test/decompiler/reference/jak2/kernel/gstring_REF.gc @@ -695,7 +695,7 @@ (cond (a0-2 (dotimes (a0-3 (the int f1-5)) - (set! f2-6 (* 0.1 f2-6)) + (set! f2-6 (/ f2-6 10)) (nop!) (nop!) ) diff --git a/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc b/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc index 7736d4adc8..dc36b9abc2 100644 --- a/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc @@ -294,7 +294,7 @@ (quaternion-rotate-y! (-> self root quat) (-> self root quat) (* (-> self rotspeed) (seconds-per-frame))) (let ((f1-2 (- (-> self dest-height) (-> self root trans y)))) (if (< 0.0 f1-2) - (+! (-> self root trans y) (* (fmax 6144.0 (* 0.5 f1-2)) (seconds-per-frame))) + (+! (-> self root trans y) (* (fmax 6144.0 (/ f1-2 2)) (seconds-per-frame))) ) ) (update! (-> self sound)) @@ -314,7 +314,7 @@ (quaternion-rotate-y! (-> self root quat) (-> self root quat) (* (-> self rotspeed) (seconds-per-frame))) (let ((f1-2 (- (-> self dest-height) (-> self root trans y)))) (if (< 0.0 f1-2) - (+! (-> self root trans y) (* (fmax 6144.0 (* 0.5 f1-2)) (seconds-per-frame))) + (+! (-> self root trans y) (* (fmax 6144.0 (/ f1-2 2)) (seconds-per-frame))) ) ) (update! (-> self sound)) diff --git a/test/decompiler/reference/jak2/levels/castle/boss/casboss-texture_REF.gc b/test/decompiler/reference/jak2/levels/castle/boss/casboss-texture_REF.gc index 701dda4574..0d68dc6158 100644 --- a/test/decompiler/reference/jak2/levels/castle/boss/casboss-texture_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/boss/casboss-texture_REF.gc @@ -160,8 +160,8 @@ ) (else (let ((f0-16 (+ 0.1 (* (-> s5-0 extra w) (sin (* 32768.0 (/ (-> s5-0 extra y) (-> s5-0 extra z)))))))) - (set-vector! (-> s5-0 start-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) - (set-vector! (-> s5-0 end-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 start-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 end-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) ) (set! (-> s5-0 extra y) (- (-> s5-0 extra y) (* 300.0 (seconds-per-frame)))) ) 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 1133e0fd53..a32288ac90 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 @@ -1134,7 +1134,7 @@ (f2-2 f1-1) (f2-4 (/ 1.0 f2-2)) ) - (+ 1.0 (* 0.2 f0-0)) + (+ 1.0 (/ f0-0 5)) (set! (-> this delta-wiggle-angle) (* 182.04445 f1-1)) (set! (-> this wiggle-factor) (* 2.0 f2-4)) ) diff --git a/test/decompiler/reference/jak2/levels/castle/castle-texture_REF.gc b/test/decompiler/reference/jak2/levels/castle/castle-texture_REF.gc index 5278050010..84e1772ce4 100644 --- a/test/decompiler/reference/jak2/levels/castle/castle-texture_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/castle-texture_REF.gc @@ -736,7 +736,7 @@ (set! (-> a1-4 data 0 end-time) f0-3) (set! (-> a1-4 data 1 end-time) f0-3) ) - (set! f0-3 (* 0.5 f0-3)) + (set! f0-3 (/ f0-3 2)) ) ) #f diff --git a/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc b/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc index c1f3ae9f13..1f11b97eb5 100644 --- a/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc @@ -495,10 +495,10 @@ (ja-channel-push! 1 (seconds 0.2)) (let ((f30-0 (rnd-float-range self 0.9 1.1))) (until #f - (ja-no-eval :group! roboguard-idle0-ja :num! (seek! 10.0 (* 0.1 f30-0)) :frame-num 9.0) + (ja-no-eval :group! roboguard-idle0-ja :num! (seek! 10.0 (/ f30-0 10)) :frame-num 9.0) (until (ja-done? 0) (suspend) - (ja :num! (seek! 10.0 (* 0.1 f30-0))) + (ja :num! (seek! 10.0 (/ f30-0 10))) ) ) ) @@ -1153,7 +1153,7 @@ s5-1 s5-1 gp-0 - (* (fmax 0.5 (* 0.00024414062 (-> arg0 state speed))) (seconds-per-frame)) + (* (fmax 0.5 (/ (-> arg0 state speed) METER_LENGTH)) (seconds-per-frame)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc b/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc index 020497ee9b..ac53696c2a 100644 --- a/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc @@ -1121,7 +1121,7 @@ (set! (-> t0-0 z) 0.0) (set! (-> t0-0 w) 1.0) (let ((v0-5 (t9-5 a0-31 a1-16 a2-22 a3-1 t0-0 (/ f28-0 f30-0)))) - (set! (-> s1-0 delta-y) (* 0.05 (-> v0-5 y) (vector-length (-> s1-0 speed)))) + (set! (-> s1-0 delta-y) (* (/ (-> v0-5 y) 20) (vector-length (-> s1-0 speed)))) ) ) ) @@ -2625,7 +2625,7 @@ ) (set! (-> v1-3 main-y) (- (-> s4-0 feet s0-0 real-position y) (-> s4-0 root trans y))) (set! (-> v1-3 main-y) (-> v1-3 delta-y)) - (+! f30-0 (* 0.25 (-> v1-3 main-y))) + (+! f30-0 (/ (-> v1-3 main-y) 4)) (set! (-> s1-0 quad) (-> v1-3 pos-offset quad)) (set! (-> s1-0 y) (* -2.0 (-> v1-3 main-y))) (new 'stack-no-clear 'vector) diff --git a/test/decompiler/reference/jak2/levels/city/common/nav-graph_REF.gc b/test/decompiler/reference/jak2/levels/city/common/nav-graph_REF.gc index 7be06a606c..003cf38278 100644 --- a/test/decompiler/reference/jak2/levels/city/common/nav-graph_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/common/nav-graph_REF.gc @@ -12,7 +12,7 @@ ;; definition for method 17 of type nav-branch ;; WARN: Return type mismatch int vs none. (defmethod set-speed-limit ((this nav-branch) (arg0 float)) - (set! (-> this speed-limit) (the-as uint (max 0 (min 255 (the int (+ 0.5 (* 0.0009765625 arg0))))))) + (set! (-> this speed-limit) (the-as uint (max 0 (min 255 (the int (+ 0.5 (/ arg0 1024))))))) 0 (none) ) @@ -20,7 +20,7 @@ ;; definition for method 18 of type nav-branch ;; WARN: Return type mismatch int vs none. (defmethod set-width ((this nav-branch) (arg0 float)) - (set! (-> this width) (the-as uint (max 0 (min 255 (the int (+ 0.5 (* 0.00390625 arg0))))))) + (set! (-> this width) (the-as uint (max 0 (min 255 (the int (+ 0.5 (/ arg0 256))))))) 0 (none) ) @@ -328,7 +328,7 @@ ;; definition for method 16 of type nav-node ;; WARN: Return type mismatch int vs none. (defmethod set-radius ((this nav-node) (arg0 float)) - (set! (-> this radius) (the-as uint (max 0 (min 255 (the int (+ 0.5 (* 0.0009765625 arg0))))))) + (set! (-> this radius) (the-as uint (max 0 (min 255 (the int (+ 0.5 (/ arg0 1024))))))) 0 (none) ) diff --git a/test/decompiler/reference/jak2/levels/city/common/trail_REF.gc b/test/decompiler/reference/jak2/levels/city/common/trail_REF.gc index 7a19f69c89..4cb1c6021e 100644 --- a/test/decompiler/reference/jak2/levels/city/common/trail_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/common/trail_REF.gc @@ -508,7 +508,7 @@ ) 0 (let* ((f0-0 (-> v1-0 cell-width)) - (f1-1 (* 0.5 f0-0)) + (f1-1 (/ (the float f0-0) 2)) ) (let ((f3-0 (- (-> arg0 x) f1-1)) (f2-2 (- (-> arg0 z) f1-1)) diff --git a/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc index 8a10237b4a..c17f0a9943 100644 --- a/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc @@ -495,11 +495,11 @@ ) (vector+! (-> s1-0 trans) s4-0 s3-0) (vector-float*! (-> s1-0 trans) (-> s1-0 trans) 0.5) - (+! (-> s1-0 trans y) (* 0.5 arg1)) + (+! (-> s1-0 trans y) (/ arg1 2)) (vector-! (the-as vector (-> s2-2 vector)) s3-0 s4-0) (let ((f30-1 (vector-normalize-ret-len! (the-as vector (-> s2-2 vector)) 1.0))) - (set! (-> s1-0 scale x) (* 0.00024414062 f30-1)) - (set! (-> s1-0 scale y) (* 0.00024414062 arg1)) + (set! (-> s1-0 scale x) (/ f30-1 METER_LENGTH)) + (set! (-> s1-0 scale y) (/ arg1 METER_LENGTH)) (set! (-> s1-0 scale z) 1.0) (set! (-> s2-2 vector 1 quad) (-> (new 'static 'vector :y 1.0 :w 1.0) quad)) (vector-cross! (-> s2-2 vector 2) (the-as vector (-> s2-2 vector)) (-> s2-2 vector 1)) @@ -509,7 +509,7 @@ (set! (-> this plane w) (- (vector-dot (-> s2-2 vector 2) (-> this root trans)))) (let ((v0-8 (-> this root root-prim local-sphere))) (set! (-> v0-8 x) 0.0) - (set! (-> v0-8 y) (* 0.00024414062 (* 0.5 arg1))) + (set! (-> v0-8 y) (* 0.00024414062 (/ arg1 2))) (set! (-> v0-8 z) 0.0) (let ((f0-20 0.5) (f1-7 (* f30-1 f30-1)) @@ -684,7 +684,7 @@ 0.0 0.0 0.0 - (let* ((f28-0 (/ 1.0 (* 0.00024414062 (-> arg1 omega)))) + (let* ((f28-0 (/ 1.0 (/ (-> arg1 omega) METER_LENGTH))) (f26-0 (* (rand-vu-float-range -136.53334 136.53334) f28-0)) (f30-0 (* (rand-vu-float-range 0.0 136.53334) f28-0)) (f0-8 (* (rand-vu-float-range -13.653334 54.613335) f28-0)) @@ -1866,7 +1866,7 @@ (.add.mul.w.vf vf6 vf4 vf0 acc :mask #b111) (.svf (&-> s0-0 quad) vf6) (let ((f30-0 (vector-vector-xz-distance s4-0 s0-0))) - (let ((f0-2 (* 0.0000012207031 f30-0)) + (let ((f0-2 (/ f30-0 (meters 200))) (a0-7 s4-0) ) (let ((v1-10 s4-0)) @@ -1940,7 +1940,7 @@ ) ) (let ((s5-1 (new 'stack-no-clear 'quaternion))) - (let ((f0-42 (/ 45511.11 (* 0.00024414062 f30-0)))) + (let ((f0-42 (/ 45511.11 (/ f30-0 METER_LENGTH)))) (quaternion-axis-angle! s5-1 1.0 0.0 0.0 (fmax (fmin (-> this angle-guns) f0-42) (- f0-42))) ) (quaternion*! diff --git a/test/decompiler/reference/jak2/levels/city/onintent/onin-game_REF.gc b/test/decompiler/reference/jak2/levels/city/onintent/onin-game_REF.gc index 7839c1a2ef..958ab277c9 100644 --- a/test/decompiler/reference/jak2/levels/city/onintent/onin-game_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/onintent/onin-game_REF.gc @@ -1090,8 +1090,8 @@ (let* ((a0-1 (-> arg4 control)) (v1-1 (vector-! (new 'stack-no-clear 'vector) (-> arg2 x-y-z-sx) (-> a0-1 origin trans))) ) - (set! (-> arg1 vel-sxvel x) (* 0.083333336 (-> v1-1 x))) - (set! (-> arg1 vel-sxvel y) (* 0.083333336 (-> v1-1 y))) + (set! (-> arg1 vel-sxvel x) (/ (-> v1-1 x) 12)) + (set! (-> arg1 vel-sxvel y) (/ (-> v1-1 y) 12)) ) 0 (none) @@ -1451,9 +1451,9 @@ (let* ((a0-1 (-> arg4 control)) (v1-1 (vector-! (new 'stack-no-clear 'vector) (-> arg2 x-y-z-sx) (-> a0-1 origin trans))) ) - (set! (-> arg1 vel-sxvel x) (* -0.008333334 (-> v1-1 x))) - (set! (-> arg1 vel-sxvel y) (* -0.008333334 (-> v1-1 y))) - (set! (-> arg1 vel-sxvel z) (* -0.008333334 (-> v1-1 z))) + (set! (-> arg1 vel-sxvel x) (/ (-> v1-1 x) -120)) + (set! (-> arg1 vel-sxvel y) (/ (-> v1-1 y) -120)) + (set! (-> arg1 vel-sxvel z) (/ (-> v1-1 z) -120)) ) 0 (none) diff --git a/test/decompiler/reference/jak2/levels/city/palace/ctypal-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/palace/ctypal-obs_REF.gc index 8eaf19aae1..5b7f54cd42 100644 --- a/test/decompiler/reference/jak2/levels/city/palace/ctypal-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/palace/ctypal-obs_REF.gc @@ -241,9 +241,9 @@ (format 0 "trans ~F ~F ~F~%" - (* 0.00024414062 (-> v1-10 trans x)) - (* 0.00024414062 (-> v1-10 trans y)) - (* 0.00024414062 (-> v1-10 trans z)) + (/ (-> v1-10 trans x) METER_LENGTH) + (/ (-> v1-10 trans y) METER_LENGTH) + (/ (-> v1-10 trans z) METER_LENGTH) ) ) (set! (-> this ent) arg0) diff --git a/test/decompiler/reference/jak2/levels/city/slums/kor/kid3-course_REF.gc b/test/decompiler/reference/jak2/levels/city/slums/kor/kid3-course_REF.gc index 0b31682187..c42018052d 100644 --- a/test/decompiler/reference/jak2/levels/city/slums/kor/kid3-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/slums/kor/kid3-course_REF.gc @@ -95,7 +95,7 @@ (quaternion-vector-angle! (-> arg1 root quat) *up-vector* - (* 182.04445 (* 0.00024414062 (-> arg1 course spots 1 center w))) + (* 182.04445 (/ (-> arg1 course spots 1 center w) METER_LENGTH)) ) (ai-task-control-method-12 (-> arg1 ai-ctrl) arg1) (go-to-waypoint! arg1 5 #f) diff --git a/test/decompiler/reference/jak2/levels/city/slums/kor/kor3-course_REF.gc b/test/decompiler/reference/jak2/levels/city/slums/kor/kor3-course_REF.gc index 9c9683d594..502da273d7 100644 --- a/test/decompiler/reference/jak2/levels/city/slums/kor/kor3-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/slums/kor/kor3-course_REF.gc @@ -95,7 +95,7 @@ (quaternion-vector-angle! (-> arg1 root quat) *up-vector* - (* 182.04445 (* 0.00024414062 (-> arg1 course spots 1 center w))) + (* 182.04445 (/ (-> arg1 course spots 1 center w) METER_LENGTH)) ) (ai-task-control-method-12 (-> arg1 ai-ctrl) arg1) (go-to-waypoint! arg1 5 #f) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-norm_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-norm_REF.gc index fa4402b414..44d07d8cdf 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-norm_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen-norm_REF.gc @@ -450,7 +450,7 @@ (if (or (= (-> this incoming knocked-type) (knocked-type knocked-type-2)) (= (-> this incoming knocked-type) (knocked-type knocked-type-3)) ) - (set! (-> arg0 anim-speed) (* 0.5 (-> arg0 anim-speed))) + (set! (-> arg0 anim-speed) (/ (-> arg0 anim-speed) 2)) ) (let ((a0-47 (-> this skel root-channel 0))) (set! (-> a0-47 frame-group) (the-as art-joint-anim s4-0)) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen_REF.gc index b85ef8037c..a46551da3c 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/citizen_REF.gc @@ -618,7 +618,7 @@ s5-1 s5-1 gp-0 - (* (fmax 0.5 (* 0.00024414062 (-> arg0 state speed))) (seconds-per-frame)) + (* (fmax 0.5 (/ (-> arg0 state speed) METER_LENGTH)) (seconds-per-frame)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/civilian_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/civilian_REF.gc index 741012fc91..83fb2b3687 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/civilian_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/civilian_REF.gc @@ -1053,7 +1053,7 @@ ) (if (and (-> self allow-dive) (< (vector-length v1-8) (* (-> self dive-reaction) (vector-length (-> self cp-vec)))) - (< (fabs (vector4-dot (-> self root trans) (the-as vector (-> self cp-plane)))) (* 0.5 (-> self cp-sphere r))) + (< (fabs (vector4-dot (-> self root trans) (the-as vector (-> self cp-plane)))) (/ (-> self cp-sphere r) 2)) ) (go-dive self) ) 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 30e8108ce3..967de0b950 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 @@ -1083,7 +1083,7 @@ (((knocked-type knocked-type-2)) (ja-channel-push! 1 (seconds 0.1)) (let ((a1-17 (-> this draw art-group data (-> this info knocked (-> this hit-face))))) - (set! (-> arg0 anim-speed) (* 0.5 (-> arg0 anim-speed))) + (set! (-> arg0 anim-speed) (/ (-> arg0 anim-speed) 2)) (let ((a0-36 (-> this skel root-channel 0))) (set! (-> a0-36 frame-group) (the-as art-joint-anim a1-17)) (set! (-> a0-36 param 0) (the float (+ (-> (the-as art-joint-anim a1-17) frames num-frames) -1))) @@ -1668,7 +1668,7 @@ (set! (-> this target-vel) (vector-length (-> this target-vel-vec))) (let ((s5-4 (vector-! (new 'stack-no-clear 'vector) (-> this root trans) (-> this target-pos)))) (let* ((f0-3 (vector-length s5-4)) - (f0-4 (* 0.0000012207031 f0-3)) + (f0-4 (/ f0-3 (meters 200))) (a1-9 (-> this target-pos-predict)) ) (let ((v1-62 (-> this target-pos))) @@ -2082,7 +2082,7 @@ (.svf (&-> a1-6 quad) vf6) ) (let ((f30-2 (* 0.5 (vector-vector-xz-distance s5-0 s3-0)))) - (vector-normalize! s4-0 (* 0.5 f30-2)) + (vector-normalize! s4-0 (/ f30-2 2)) (vector-normalize! s2-0 (* 2.0 f30-2)) ) (do-spline gp-0 s5-0 s4-0 s3-0 s2-0 0.9) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc index 98d8022a85..ab4bd539fd 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc @@ -581,7 +581,7 @@ (set! (-> this last-change-dir) (the-as uint (current-time))) (set! (-> this change-dir-time) (rand-vu-int-range (seconds 0.5) (seconds 0.7))) (let ((s3-2 (new 'stack-no-clear 'vector)) - (f0-9 (* 0.5 f30-0 (tan (-> this move-angle)))) + (f0-9 (* (/ f30-0 2) (tan (-> this move-angle)))) (s2-0 (new 'stack-no-clear 'vector)) ) (if (-> this heading) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc index 05a5b578f3..f10949d29d 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc @@ -751,7 +751,7 @@ (.sub.vf vf6 vf4 vf5 :mask #b111) (.svf (&-> sv-240 quad) vf6) (let* ((f0-5 (vector-length sv-240)) - (f0-6 (* 0.0000018780048 f0-5)) + (f0-6 (/ f0-5 (meters 130))) ) (set! sv-256 (new 'stack-no-clear 'vector)) (let ((s0-0 (new 'stack-no-clear 'vector)) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/traffic-engine_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/traffic-engine_REF.gc index c43543382f..1271be7a18 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/traffic-engine_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/traffic-engine_REF.gc @@ -663,9 +663,8 @@ (+! (-> s4-0 params position z) (* (-> s4-0 vector 0 x) f0-6)) ) ) - (set! (-> s4-0 vector 2 y) (+ (* 0.5 (-> s4-0 vector 2 x)) - (* (-> this rand) (-> this traffic inv-density-factor) (-> arg1 spawn-spacing)) - ) + (set! (-> s4-0 vector 2 y) + (+ (/ (-> s4-0 vector 2 x) 2) (* (-> this rand) (-> this traffic inv-density-factor) (-> arg1 spawn-spacing))) ) (vector-float*! (-> s4-0 params velocity) (the-as vector (-> s4-0 vector)) (-> s4-0 vector 2 x)) (vector-float*! (-> s4-0 vector 1) (the-as vector (-> s4-0 vector)) (-> s4-0 vector 2 y)) @@ -1418,7 +1417,7 @@ (set! decay-rate 1.5) ) ) - (set! (-> v1-1 0 decay-rate) (* 0.1 decay-rate)) + (set! (-> v1-1 0 decay-rate) (/ decay-rate 10)) (when (< (-> v1-1 0 danger-level) danger-level) (set! (-> v1-1 0 danger-level) danger-level) (set! (-> v1-1 0 sphere r) danger-radius) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc index f52cbac275..1fb386ba82 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc @@ -1151,10 +1151,10 @@ (f28-0 (* -13653.333 (-> this controls brake))) (s5-0 (new 'static 'vector :x 1.0 :w 1.0)) ) - (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ f26-0 (* 0.2 f30-0))) - (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (- f26-0) (* 0.2 f30-0))) - (quaternion-vector-angle! (-> this fin-fl rotation) s5-0 (- (* -0.2 f26-0) f30-0)) - (quaternion-vector-angle! (-> this fin-fr rotation) s5-0 (- (* 0.2 f26-0) f30-0)) + (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ f26-0 (/ f30-0 5))) + (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (- f26-0) (/ f30-0 5))) + (quaternion-vector-angle! (-> this fin-fl rotation) s5-0 (- (/ f26-0 -5) f30-0)) + (quaternion-vector-angle! (-> this fin-fr rotation) s5-0 (- (/ f26-0 5) f30-0)) (quaternion-vector-angle! (-> this rudder rotation) s5-0 f30-0) (quaternion-vector-angle! (-> this brake-l rotation) s5-0 f28-0) (quaternion-vector-angle! (-> this brake-r rotation) s5-0 f28-0) @@ -1309,8 +1309,8 @@ (f28-0 (* 13653.333 (-> this controls brake))) (s5-0 (new 'static 'vector :x 1.0 :w 1.0)) ) - (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ f26-0 (* 0.2 f30-0))) - (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (- f26-0) (* 0.2 f30-0))) + (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ f26-0 (/ f30-0 5))) + (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (- f26-0) (/ f30-0 5))) (quaternion-vector-angle! (-> this rudder rotation) s5-0 f30-0) (quaternion-vector-angle! (-> this rudder-f rotation) s5-0 (- f30-0)) (quaternion-vector-angle! (-> this brake-l rotation) s5-0 (- f28-0)) @@ -1488,8 +1488,8 @@ (quaternion-vector-angle! (-> this fin-fr rotation) s5-0 f26-0) (quaternion-vector-angle! (-> this fin2-fl rotation) s5-0 (- f26-0)) (quaternion-vector-angle! (-> this fin2-fr rotation) s5-0 f26-0) - (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ f26-0 (* 0.2 f30-0))) - (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (- f26-0) (* 0.2 f30-0))) + (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ f26-0 (/ f30-0 5))) + (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (- f26-0) (/ f30-0 5))) (quaternion-vector-angle! (-> this rudder rotation) s5-0 f30-0) (quaternion-vector-angle! (-> this brake-l rotation) s5-0 (- f28-0)) (quaternion-vector-angle! (-> this brake-r rotation) s5-0 f28-0) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/car_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/car_REF.gc index 761ec77e06..47c6439697 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/car_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/car_REF.gc @@ -1606,10 +1606,10 @@ (quaternion-vector-angle! (-> this steering-wheel rotation) s5-0 f0-3) (quaternion-vector-angle! (-> this fin-fl rotation) s5-0 (- f28-0)) (quaternion-vector-angle! (-> this fin-fr rotation) s5-0 f28-0) - (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ (* 0.8 f28-0) (* -0.2 f30-0))) - (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (* -0.8 f28-0) (* -0.2 f30-0))) - (quaternion-vector-angle! (-> this fin2-rl rotation) s5-0 (+ (* 0.2 f28-0) (* -0.8 f30-0))) - (quaternion-vector-angle! (-> this fin2-rr rotation) s5-0 (+ (* -0.2 f28-0) (* -0.8 f30-0))) + (quaternion-vector-angle! (-> this fin-rl rotation) s5-0 (+ (* 0.8 f28-0) (/ f30-0 -5))) + (quaternion-vector-angle! (-> this fin-rr rotation) s5-0 (+ (* -0.8 f28-0) (/ f30-0 -5))) + (quaternion-vector-angle! (-> this fin2-rl rotation) s5-0 (+ (/ f28-0 5) (* -0.8 f30-0))) + (quaternion-vector-angle! (-> this fin2-rr rotation) s5-0 (+ (/ f28-0 -5) (* -0.8 f30-0))) ) 0 (none) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-effects_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-effects_REF.gc index be455e5dca..961886a997 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-effects_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-effects_REF.gc @@ -171,7 +171,7 @@ ;; WARN: Return type mismatch object vs none. (defun calc-fade-vals ((arg0 float)) "@unused just a debugging print function" - (let* ((f1-1 (* 0.00024414062 arg0)) + (let* ((f1-1 (/ arg0 METER_LENGTH)) (f0-3 (- f1-1 (the float (the int f1-1)))) (f1-3 (* 4096.0 (- f1-1 f0-3))) (f1-5 (/ -1.0 (* (- 1.0 f0-3) f1-3))) @@ -234,14 +234,14 @@ (init-vf0-vector) (let* ((f0-0 (rand-vu-float-range 1.0 1.33)) (s4-1 (* arg3 f0-0)) - (s0-0 (fmin (* arg2 f0-0) (* 0.5 s4-1))) + (s0-0 (fmin (* arg2 f0-0) (/ s4-1 2))) (s3-1 (new 'stack-no-clear 'inline-array 'vehicle-control-point 3)) (s2-0 (-> this info)) ) (let ((a1-2 (-> s3-1 0 normal))) (let ((v1-2 arg0)) (let ((a0-2 arg1)) - (let ((a2-2 (* 0.25 s4-1))) + (let ((a2-2 (/ s4-1 4))) (.mov vf7 a2-2) ) (.lvf vf5 (&-> a0-2 quad)) @@ -269,13 +269,13 @@ (let ((f0-14 (* 4.0 s0-0))) (set! (-> s3-1 1 local-pos w) f0-14) (set! (-> s3-1 1 normal w) f0-14) - (set! (-> s3-1 1 normal x) (* 0.025 f0-14)) + (set! (-> s3-1 1 normal x) (/ f0-14 40)) ) (add! *simple-sprite-system* (the-as sprite-glow-data (-> s3-1 1))) (forward-up->quaternion (the-as quaternion (-> s3-1 0)) arg1 (the-as vector (-> this rbody state matrix))) (quaternion-rotate-local-x! (the-as quaternion (-> s3-1 0)) (the-as quaternion (-> s3-1 0)) 32768.0) (let ((v1-16 (-> s3-1 0 normal))) - (let ((a0-10 (* 0.5 s4-1))) + (let ((a0-10 (/ s4-1 2))) (.mov vf7 a0-10) ) (.lvf vf5 (&-> arg1 quad)) @@ -458,7 +458,7 @@ (-> this info part-vel) (-> this rbody state lin-velocity) (-> s5-0 0 vector 1) - (* 0.2 (-> this info max-engine-thrust) (+ 0.5 (-> this engine-power-factor))) + (* (/ (-> this info max-engine-thrust) 5) (+ 0.5 (-> this engine-power-factor))) ) (let ((v1-117 (-> this info part-vel)) (a0-45 (-> this info part-vel)) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-guard_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-guard_REF.gc index 40972bd02c..49d95bce3e 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-guard_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-guard_REF.gc @@ -388,7 +388,7 @@ (-> gp-0 vec-12 x) ) ) - (set! (-> this aim-rot-vel s3-1) (* (-> this aim-rot-vel s3-1) (fmax 0.0 (- 1.0 (* 0.1 (-> gp-0 vec-12 x)))))) + (set! (-> this aim-rot-vel s3-1) (* (-> this aim-rot-vel s3-1) (fmax 0.0 (- 1.0 (/ (-> gp-0 vec-12 x) 10))))) (+! (-> this aim-rot s3-1) (* (-> this aim-rot-vel s3-1) (-> gp-0 vec-12 x))) (when (or (zero? s3-1) (not (logtest? (-> this flags) (turret-flag no-rot-y-clamp)))) (let ((f0-31 (-> this info rot-min s3-1))) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-physics_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-physics_REF.gc index 14cf49cf22..1625f61b42 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-physics_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-physics_REF.gc @@ -26,7 +26,7 @@ (let ((f1-5 (fmin (-> this water-height) (+ (-> s0-0 world-sphere y) (-> s0-0 world-sphere w))))) 0.0 (let* ((f2-5 (fmax -1.0 (fmin 1.0 (/ (- (-> this water-height) (-> s0-0 world-sphere y)) (-> s0-0 world-sphere w))))) - (f30-0 (+ 0.5 (* -0.25 f2-5 f2-5 f2-5) (* 0.75 f2-5))) + (f30-0 (+ 0.5 (* (/ f2-5 -4) f2-5 f2-5) (* 0.75 f2-5))) ) (set! (-> s4-0 local-pos 0 y) (* 0.5 (+ f0-2 f1-5))) (let ((v1-18 (-> this rbody)) @@ -354,8 +354,8 @@ (let ((f1-20 (fmax 0.0 f0-38))) (+! (-> this lift-thrust s2-1) f1-20) (when (logtest? (rigid-body-object-flag flight-level-transition) (-> this flags)) - (+! (-> this roll-thrust 0) (* 0.05 f1-20)) - (+! (-> this roll-thrust 1) (* 0.05 f1-20)) + (+! (-> this roll-thrust 0) (/ f1-20 20)) + (+! (-> this roll-thrust 1) (/ f1-20 20)) ) ) (vector-reset! (-> arg1 force)) @@ -377,7 +377,7 @@ (and (> (-> this flight-level-index) 0) (< f0-40 0.0) (< (-> arg1 velocity y) 0.0)) ) (vector-reset! (-> arg1 force)) - (let ((f0-43 (* -0.25 (-> this info inv-lift-thruster-count))) + (let ((f0-43 (/ (-> this info inv-lift-thruster-count) -4)) (f1-28 arg0) ) (set! (-> arg1 force y) (* f0-43 (/ 1.0 f1-28) (-> this info info mass) (-> arg1 velocity y))) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc index 70934668c4..b3d518cd4d 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc @@ -478,7 +478,7 @@ (let* ((v1-1 (-> this rbody state lin-velocity)) (f0-4 (sqrtf (+ (* (-> v1-1 x) (-> v1-1 x)) (* (-> v1-1 z) (-> v1-1 z))))) (f0-6 (/ (- arg0 f0-4) arg0)) - (f1-6 (* 0.005 f0-6)) + (f1-6 (/ f0-6 200)) ) (set! (-> this controls throttle) (fmax 0.0 (fmin 1.0 (+ (-> this controls throttle) f1-6)))) ) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle_REF.gc index 092b0e0739..c2f8785819 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle_REF.gc @@ -478,7 +478,7 @@ (set! f1-6 (* f0-23 f0-23)) ) (if (not (logtest? (-> this flags) (rigid-body-object-flag riding))) - (set! f1-6 (* 0.5 f1-6)) + (set! f1-6 (/ f1-6 2)) ) ) (+! (-> this power-level) @@ -1272,7 +1272,7 @@ ) (when (< f0-9 (* f1-8 f1-8)) (let ((f0-10 (vector-length (-> this root transv)))) - (seek! (-> this engine-power-factor) (* 0.000016276043 f0-10) (* 6.0 (seconds-per-frame))) + (seek! (-> this engine-power-factor) (/ f0-10 (meters 15)) (* 6.0 (seconds-per-frame))) ) (do-engine-sounds this) ) @@ -1542,7 +1542,7 @@ ((or (logtest? (penetrate dark-giant) arg3) (and (logtest? (-> arg1 mask) (attack-mask mode)) (= (-> arg1 mode) 'eco-dark)) ) - (set! (-> s5-0 vector 2 y) (* 0.1 (-> s5-0 vector 2 y))) + (set! (-> s5-0 vector 2 y) (/ (-> s5-0 vector 2 y) 10)) (set! f0-2 (* 409600.0 (-> this info info mass))) (/ 0.4 (-> this info damage-factor)) ) diff --git a/test/decompiler/reference/jak2/levels/common/ai/sig/sig-plasma_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/sig/sig-plasma_REF.gc index aa3c42ac94..d218fa009f 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/sig/sig-plasma_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/sig/sig-plasma_REF.gc @@ -193,7 +193,7 @@ (static-sound-name "sig-gun-powerup") (-> this powerup-sound-id) (the int (* 1024.0 f28-0)) - (the int (* 1524.0 (+ 0.5 (* 0.5 f30-0)))) + (the int (* 1524.0 (+ 0.5 (/ f30-0 2)))) 0 (sound-group sfx) s4-0 diff --git a/test/decompiler/reference/jak2/levels/common/ai/sig/sig-states_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/sig/sig-states_REF.gc index ab086df9bf..c3ec7d9358 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/sig/sig-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/sig/sig-states_REF.gc @@ -1507,7 +1507,7 @@ (until #f (suspend) (let* ((f0-1 (vector-length (-> self root transv))) - (f0-3 (fmax 0.1 (* 0.000020345053 f0-1))) + (f0-3 (fmax 0.1 (/ f0-1 (meters 12)))) ) (ja :num! (loop! f0-3)) ) @@ -1628,14 +1628,14 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.15)) (let* ((f0-0 (vector-length (-> self root transv))) - (f0-2 (fmax 0.1 (* 0.000020345053 f0-0))) + (f0-2 (fmax 0.1 (/ f0-0 (meters 12)))) ) (ja-no-eval :group! sig-chased-run-jump-land0-ja :num! (seek! max f0-2) :frame-num 0.0) ) (until (ja-done? 0) (suspend) (let* ((f0-4 (vector-length (-> self root transv))) - (f0-6 (fmax 0.1 (* 0.000020345053 f0-4))) + (f0-6 (fmax 0.1 (/ f0-4 (meters 12)))) ) (ja :num! (seek! max f0-6)) ) @@ -1762,14 +1762,14 @@ :code (behavior () (ja-channel-push! 1 (seconds 0.15)) (let* ((f0-0 (vector-length (-> self root transv))) - (f0-2 (fmax 0.1 (* 0.000020345053 f0-0))) + (f0-2 (fmax 0.1 (/ f0-0 (meters 12)))) ) (ja-no-eval :group! sig-chased-shoot-jump-land0-ja :num! (seek! max f0-2) :frame-num 0.0) ) (until (ja-done? 0) (suspend) (let* ((f0-4 (vector-length (-> self root transv))) - (f0-6 (fmax 0.1 (* 0.000020345053 f0-4))) + (f0-6 (fmax 0.1 (/ f0-4 (meters 12)))) ) (ja :num! (seek! max f0-6)) ) diff --git a/test/decompiler/reference/jak2/levels/common/ai/sig/sig_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/sig/sig_REF.gc index 6103b25ebb..c6a937cf67 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/sig/sig_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/sig/sig_REF.gc @@ -1009,19 +1009,19 @@ (cond ((or (not (and v1-6 (= v1-6 (-> this draw art-group data 3)))) (or (= (-> this jump-why) 4) (>= f2-1 8192.0))) (logior! (-> this bot-flags) (bot-flags bf23)) - (let ((f2-3 (fmax 12288.0 (* 0.5 f1-0))) + (let ((f2-3 (fmax 12288.0 (/ f1-0 2))) (f1-3 (fmax (-> arg0 start-pos y) (-> arg0 dest-pos y))) ) (- (fmax (+ (fmin (-> arg0 start-pos y) (-> arg0 dest-pos y)) f2-3) (+ 10240.0 f1-3)) f1-3) ) ) (else - (fmax 2048.0 (* 0.2 f1-0)) + (fmax 2048.0 (/ f1-0 5)) ) ) ) ) - (setup-from-to-height! (-> arg0 traj) (-> arg0 start-pos) (-> arg0 dest-pos) f1-4 (* 0.000011111111 f0-2)) + (setup-from-to-height! (-> arg0 traj) (-> arg0 start-pos) (-> arg0 dest-pos) f1-4 (/ f0-2 90000)) ) ) (none) diff --git a/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc b/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc index 161ab0cbc7..3b12ced1b5 100644 --- a/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc @@ -925,7 +925,7 @@ (get-point-in-path! (-> this path-r) (new 'stack-no-clear 'vector) 0.0 'interp) ) ) - (set! (-> this wall-xz) (* 0.5 (-> this wall-xz))) + (set! (-> this wall-xz) (/ (-> this wall-xz) 2)) (+! (-> this wall-xz) 4096.0) (set! (-> this wall-y) (fabs diff --git a/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc index 9f53ed1fb6..66f8fc7f94 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc @@ -768,7 +768,7 @@ (set! (-> s2-0 quad) (-> (get-trans (the-as process-focusable s0-0) 3) quad)) (let ((s1-2 (vector-! (new 'stack-no-clear 'vector) (-> this root trans) s2-0))) (let* ((f0-0 (vector-length s1-2)) - (f0-1 (* 0.0000030517579 f0-0)) + (f0-1 (/ f0-0 (meters 80))) (a0-7 s2-0) ) (let ((v1-17 s2-0)) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc index 5b20a50e1e..e83334570d 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc @@ -902,7 +902,7 @@ (set! (-> this last-change-dir) (the-as uint (current-time))) (set! (-> this change-dir-time) (rand-vu-int-range (seconds 0.5) (seconds 0.7))) (let ((s3-2 (new 'stack-no-clear 'vector)) - (f0-9 (* 0.5 f30-0 (tan (-> this move-angle)))) + (f0-9 (* (/ f30-0 2) (tan (-> this move-angle)))) (s2-0 (new 'stack-no-clear 'vector)) ) (if (-> this heading) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc index b200b64106..795f1454c3 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc @@ -1469,10 +1469,10 @@ (-> arg0 thrust s3-0) (+ (* 0.4 (fmax 0.0 (* (-> v0-6 x) s0-0))) (fmax 0.0 (-> v0-6 y)) - (fabs (* 0.2 (-> v0-6 z))) + (fabs (/ (-> v0-6 z) 5)) (fmax 0.0 (-> s1-1 y)) ) - (* 0.2 f30-0) + (/ f30-0 5) ) ) ) @@ -1494,7 +1494,7 @@ (set! (-> *part-id-table* 721 init-specs 0 initial-valuef) (* f24-0 f0-14)) (set! (-> arg0 thrust s3-0) f28-0) (let ((f0-15 (* f26-0 f0-14))) - (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-0 vector 1) (* -0.5 f0-15)) + (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-0 vector 1) (/ f0-15 -2)) ) ) ) @@ -1572,7 +1572,7 @@ ) (set! (-> *part-id-table* 721 init-specs 0 initial-valuef) f1-0) ) - (let ((v1-29 (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-0 vector 1) (* -0.5 f0-0)))) + (let ((v1-29 (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-0 vector 1) (/ f0-0 -2)))) (vector+! (-> s5-0 trans) s4-0 v1-29) ) ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-control_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-control_REF.gc index e92e8876ce..d258d4fc71 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-control_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-control_REF.gc @@ -1561,7 +1561,7 @@ (vector-normalize-copy! (-> s5-0 curve-matrix vector 2) s3-0 1.0) (vector-normalize-copy! (-> s5-0 curve-matrix trans) s4-0 1.0) (set! (-> s5-0 pos-index 0) (vector-dot s3-0 (-> s5-0 curve-matrix trans))) - (set! (-> s5-0 pos-index 1) (/ (* 0.5 (-> s5-0 pos-index 0) (-> s5-0 pos-index 0)) (* 0.2 f28-0))) + (set! (-> s5-0 pos-index 1) (/ (* (/ (-> s5-0 pos-index 0) 2) (-> s5-0 pos-index 0)) (/ f28-0 5))) (set! (-> s5-0 dist) (vector-dot (-> this dest-vel) (-> s5-0 curve-matrix trans))) (vector-normalize-copy! (-> s5-0 curve-matrix vector 1) s4-0 (-> this target-speed)) (vector-! (the-as vector (-> s5-0 curve-matrix)) (-> s5-0 curve-matrix vector 1) s3-0) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-edit_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-edit_REF.gc index 80f6dd81de..b760fec940 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-edit_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-edit_REF.gc @@ -22,7 +22,7 @@ (let ((s4-0 (new 'stack-no-clear 'vector))) (set! (-> s4-0 quad) (-> arg0 quad)) (let* ((f0-2 (vector-vector-distance s4-0 arg1)) - (s3-1 (+ (the int (* 0.000008138021 f0-2)) 1)) + (s3-1 (+ (the int (/ f0-2 (meters 30))) 1)) (s2-0 (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-0 move-dist) 110592.0)) ) (dotimes (s1-0 s3-1) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc index a7567068b6..113d9d9c6e 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc @@ -1278,10 +1278,10 @@ (-> arg0 thrust s3-0) (+ (* 0.4 (fmax 0.0 (* (-> v0-6 x) s0-0))) (fmax 0.0 (-> v0-6 y)) - (fabs (* 0.2 (-> v0-6 z))) + (fabs (/ (-> v0-6 z) 5)) (fmax 0.0 (-> s1-1 y)) ) - (* 0.2 f30-0) + (/ f30-0 5) ) ) ) @@ -1305,7 +1305,7 @@ (set! (-> *part-id-table* 721 init-specs 0 initial-valuef) (* f24-0 f0-15)) (set! (-> arg0 thrust s3-0) f28-0) (let ((f0-16 (* f26-0 f0-15))) - (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-0 vector 1) (* -0.5 f0-16)) + (vector-normalize-copy! (new 'stack-no-clear 'vector) (-> s5-0 vector 1) (/ f0-16 -2)) ) ) ) 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 119fb94d8a..1a228c416a 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc @@ -1110,7 +1110,7 @@ ) ) (let ((v1-17 (-> self nav))) - (set! (-> v1-17 max-rotation-rate) (* 0.05 (-> *spyder-nav-enemy-info* maximum-rotation-rate))) + (set! (-> v1-17 max-rotation-rate) (/ (-> *spyder-nav-enemy-info* maximum-rotation-rate) 20)) ) 0 (ja-channel-push! 2 (seconds 0.2)) 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 988526aca1..b95c1264d6 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 @@ -564,7 +564,7 @@ (* 40.96 (seconds-per-frame)) ) ) - (let ((f30-0 (- 1.0 (fabs (* 0.000012207031 (-> self y-offset)))))) + (let ((f30-0 (- 1.0 (fabs (/ (-> self y-offset) (meters 20)))))) (let ((f0-7 (* f30-0 f30-0))) (set-vector! (-> self root scale) f30-0 f30-0 f30-0 1.0) (let ((t9-1 vector-lerp!) @@ -601,7 +601,7 @@ :code sleep-code :post (behavior () (seek! (-> self y-offset) -81920.0 (* 49152.0 (seconds-per-frame))) - (let ((f30-0 (- 1.0 (fabs (* 0.000012207031 (-> self y-offset)))))) + (let ((f30-0 (- 1.0 (fabs (/ (-> self y-offset) (meters 20)))))) (let ((f0-5 (* f30-0 f30-0))) (set-vector! (-> self root scale) f30-0 f30-0 f30-0 1.0) (let ((t9-1 vector-lerp!) @@ -1162,7 +1162,7 @@ (f1-1 (-> this elev-angle)) (f0-7 (fmax -728.1778 (fmin 728.1778 f1-1))) (f1-2 (- f1-1 f0-7)) - (f2-3 (* 0.2 f1-2)) + (f2-3 (/ f1-2 5)) (f30-0 (+ f0-7 (* 0.8 f1-2))) ) (quaternion-vector-angle! s5-1 *x-vector* f2-3) diff --git a/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc b/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc index bddf951eb3..82f7022723 100644 --- a/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc @@ -752,7 +752,7 @@ (set! (-> this old-y-deg) f0-5) ) (set! (-> this desire-turn) - (< (+ 0.5 (* 0.00024414062 (-> this nav state speed))) (* 0.005493164 (fabs (-> this diff-angle)))) + (< (+ 0.5 (/ (-> this nav state speed) METER_LENGTH)) (* 0.005493164 (fabs (-> this diff-angle)))) ) (if (and (< (-> this root trans y) (+ -122880.0 (-> this floor))) (-> this next-state) @@ -1092,7 +1092,7 @@ (ja :group! (-> self draw art-group data (-> self enemy-info hostile-anim)) :num! min) ) ) - (ja :num! (loop! (/ (-> self nav state speed) (* 0.5 (-> self enemy-info run-travel-speed))))) + (ja :num! (loop! (/ (-> self nav state speed) (/ (-> self enemy-info run-travel-speed) 2)))) ) ((< 0.0 (-> self diff-angle)) (let ((v1-43 (ja-group))) @@ -1148,7 +1148,7 @@ (ja :group! (-> self draw art-group data (-> self enemy-info walk-anim)) :num! min) ) ) - (ja :num! (loop! (/ (-> self nav state speed) (* 0.5 (-> self enemy-info run-travel-speed))))) + (ja :num! (loop! (/ (-> self nav state speed) (/ (-> self enemy-info run-travel-speed) 2)))) ) ((< 0.0 (-> self diff-angle)) (let ((v1-27 (ja-group))) @@ -1205,7 +1205,7 @@ (ja :group! (-> self draw art-group data (-> self enemy-info walk-anim)) :num! min) ) ) - (ja :num! (loop! (/ (-> self nav state speed) (* 0.5 (-> self enemy-info run-travel-speed))))) + (ja :num! (loop! (/ (-> self nav state speed) (/ (-> self enemy-info run-travel-speed) 2)))) ) ((< 0.0 (-> self diff-angle)) (let ((v1-27 (ja-group))) diff --git a/test/decompiler/reference/jak2/levels/common/guard-projectile_REF.gc b/test/decompiler/reference/jak2/levels/common/guard-projectile_REF.gc index 182e20f8d0..418e9cfe4d 100644 --- a/test/decompiler/reference/jak2/levels/common/guard-projectile_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/guard-projectile_REF.gc @@ -417,7 +417,7 @@ (launch-particles (-> *part-id-table* 608) s4-0) ) (let ((s4-1 (new 'stack-no-clear 'matrix)) - (f26-0 (* 0.000027126736 f30-0)) + (f26-0 (/ f30-0 (meters 9))) (f30-1 (-> *part-id-table* 609 init-specs 3 initial-valuef)) (f28-1 (-> *part-id-table* 609 init-specs 4 initial-valuef)) ) diff --git a/test/decompiler/reference/jak2/levels/common/metalhead-projectile_REF.gc b/test/decompiler/reference/jak2/levels/common/metalhead-projectile_REF.gc index e138858810..1c398eee34 100644 --- a/test/decompiler/reference/jak2/levels/common/metalhead-projectile_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/metalhead-projectile_REF.gc @@ -401,7 +401,7 @@ (launch-particles (-> *part-id-table* 622) s4-0) ) (let ((s4-1 (new 'stack-no-clear 'matrix)) - (f26-0 (* 0.000020345053 f30-0)) + (f26-0 (/ f30-0 (meters 12))) (f30-1 (-> *part-id-table* 623 init-specs 3 initial-valuef)) (f28-1 (-> *part-id-table* 623 init-specs 5 initial-valuef)) ) diff --git a/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc b/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc index ae4fdd447c..0b0392178b 100644 --- a/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc @@ -835,7 +835,7 @@ (let ((v1-3 (new 'stack-no-clear 'mystery-race-manager-type))) (set! (-> v1-3 vec1 z) 81920.0) (set! (-> v1-3 word) 4) - (set! (-> v1-3 vec0 z) (* -0.5 (-> v1-3 vec1 z))) + (set! (-> v1-3 vec0 z) (/ (-> v1-3 vec1 z) -2)) (set! (-> v1-3 vec0 w) -20480.0) (set! (-> v1-3 vec1 x) (/ (-> v1-3 vec1 z) (the float (+ (-> v1-3 word) -1)))) (set! (-> v1-3 vec1 y) -40960.0) @@ -1266,7 +1266,7 @@ (let ((v1-6 gp-1)) (set! (-> v1-6 height) (the float 70)) ) - (set! (-> gp-1 origin x) (the float (- 256 (the int (* 0.5 (-> gp-1 width)))))) + (set! (-> gp-1 origin x) (the float (- 256 (the int (/ (-> gp-1 width) 2))))) (set! (-> gp-1 origin y) 320.0) (set! (-> gp-1 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s5-0 print-game-text)) @@ -1296,7 +1296,7 @@ (let ((v1-6 gp-1)) (set! (-> v1-6 height) (the float 35)) ) - (set! (-> gp-1 origin x) (the float (- 256 (the int (* 0.5 (-> gp-1 width)))))) + (set! (-> gp-1 origin x) (the float (- 256 (the int (/ (-> gp-1 width) 2))))) (set! (-> gp-1 origin y) 320.0) (set! (-> gp-1 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s5-0 print-game-text)) diff --git a/test/decompiler/reference/jak2/levels/common/race/race-mesh_REF.gc b/test/decompiler/reference/jak2/levels/common/race/race-mesh_REF.gc index 7cc15f6d50..eac5f2c89a 100644 --- a/test/decompiler/reference/jak2/levels/common/race/race-mesh_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/race/race-mesh_REF.gc @@ -884,7 +884,7 @@ (set! (-> s3-0 cell-bits 0 quad) (the-as uint128 0)) (set! (-> s3-0 cell-bits 1 quad) (the-as uint128 0)) (let ((f0-1 (/ 1.0 (-> s4-0 cell-length))) - (f1-2 (fmin (-> arg0 search-sphere r) (* 0.5 (-> s4-0 cell-length)))) + (f1-2 (fmin (-> arg0 search-sphere r) (/ (-> s4-0 cell-length) 2))) ) (let ((f3-1 (- (-> arg0 search-sphere x) f1-2)) (f2-4 (- (-> arg0 search-sphere z) f1-2)) @@ -918,7 +918,7 @@ (+! s2-0 1) ) ) - (when (and (= (-> arg0 slice-id) -1) (< (* 0.5 (-> s4-0 cell-length)) (-> arg0 search-sphere r))) + (when (and (= (-> arg0 slice-id) -1) (< (/ (-> s4-0 cell-length) 2) (-> arg0 search-sphere r))) (while (= (-> arg0 slice-id) -1) (set! (-> s3-0 bounds min x) (max 0 (+ (-> s3-0 bounds min x) -1))) (set! (-> s3-0 bounds min z) (max 0 (+ (-> s3-0 bounds min z) -1))) diff --git a/test/decompiler/reference/jak2/levels/consite/consite-scenes_REF.gc b/test/decompiler/reference/jak2/levels/consite/consite-scenes_REF.gc index d693c09399..41048e15e2 100644 --- a/test/decompiler/reference/jak2/levels/consite/consite-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/consite/consite-scenes_REF.gc @@ -654,7 +654,7 @@ (launch-particles (-> *part-id-table* 622) s3-2) ) (let ((s4-1 (new 'stack-no-clear 'matrix)) - (f26-0 (* 0.000020345053 f30-0)) + (f26-0 (/ f30-0 (meters 12))) (f30-1 (-> *part-id-table* 623 init-specs 3 initial-valuef)) (f28-1 (-> *part-id-table* 623 init-specs 5 initial-valuef)) ) diff --git a/test/decompiler/reference/jak2/levels/dig/dig-digger_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig-digger_REF.gc index 60479cdb13..a91dee2e63 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig-digger_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig-digger_REF.gc @@ -1122,7 +1122,7 @@ (set! (-> gp-0 vector 2 w) 0.0) (matrix->quaternion (-> self root quat) gp-0) ) - (set! (-> self root scale z) (* 0.000003937752 f30-0)) + (set! (-> self root scale z) (/ f30-0 (meters 62))) (when (!= (-> self old-dist) 0.0) (let ((f2-0 (fabs (- f30-0 (-> self old-dist))))) (set! (-> self frame target) (fmin 1.0 (fmax 0.0 (* 0.0008719308 (- 573.44 f2-0))))) diff --git a/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc index 8affddffd5..0f73244bd5 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc @@ -953,7 +953,7 @@ (let* ((f30-0 (the float (ja-num-frames 0))) (f0-10 (+ (* 1.5 f30-0 (get-norm! (-> self parent-ptr 0 swing-sync) 0)) (if (= (-> self parent-ptr 0 options) 1) - (* 0.5 f30-0) + (/ f30-0 2) 0.0 ) ) @@ -972,7 +972,7 @@ 1.0 0.0 ) - (* 0.02 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 50) ) (dig-balloon-lurker-trapeze-method-21 self) (suspend) @@ -1182,7 +1182,7 @@ -0.5 0.5 ) - (* 0.01 (-> self clock time-adjust-ratio)) + (/ (-> self clock time-adjust-ratio) 100) ) (let ((f0-7 (+ -1.0 (fabs (* 2.0 (-> self pedal-anim-speed))))) (f1-5 (* 2.0 (fabs (-> self pedal-anim-speed)))) @@ -1399,7 +1399,7 @@ ) ) ) - (set! (-> this anim-speed) (* 0.000015258789 f0-18)) + (set! (-> this anim-speed) (/ f0-18 (meters 16))) ) (go (method-of-object this idle)) (none) diff --git a/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc index f32627e7d1..01f38a608d 100644 --- a/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc @@ -1362,7 +1362,7 @@ (* (-> self inc-y) (-> self clock time-adjust-ratio)) (-> self ease-y) (-> self ease-y) - (* 0.05 (-> self clock time-adjust-ratio) (-> self inc-y)) + (* (/ (-> self clock time-adjust-ratio) 20) (-> self inc-y)) ) ) (set! (-> self root trans y) @@ -1444,8 +1444,8 @@ (else (set! (-> self from-y) (-> self current-y-position)) (let ((f0-6 (fabs (- (+ f30-0 (-> v1-35 ship-y-offset)) (-> self from-y))))) - (set! (-> self inc-y) (* 0.02 f0-6)) - (set! (-> self ease-y) (* 0.2 f0-6)) + (set! (-> self inc-y) (/ f0-6 50)) + (set! (-> self ease-y) (/ f0-6 5)) ) ) ) @@ -1462,7 +1462,7 @@ (* (-> self inc-y) (-> self clock time-adjust-ratio)) (-> self ease-y) (-> self ease-y) - (* 0.05 (-> self clock time-adjust-ratio) (-> self inc-y)) + (* (/ (-> self clock time-adjust-ratio) 20) (-> self inc-y)) ) ) (if (and (= (-> self current-y-position) f28-0) (-> s5-0 alive)) @@ -1517,7 +1517,7 @@ 0.0 (* 5.0 (-> pp clock time-adjust-ratio)) 90.0 - (* 0.1 (-> pp clock time-adjust-ratio)) + (/ (-> pp clock time-adjust-ratio) 10) ) ) ) @@ -1960,7 +1960,7 @@ ) ) (until #f - (seek! (-> self anim-frame) 1.0 (* 0.01 (-> self clock time-adjust-ratio))) + (seek! (-> self anim-frame) 1.0 (/ (-> self clock time-adjust-ratio) 100)) (let ((v1-12 (-> self skel root-channel 0))) (set! (-> v1-12 num-func) num-func-identity) (let ((f0-4 (-> self anim-frame)) @@ -2100,7 +2100,7 @@ ) :code (behavior () (until #f - (seek! (-> self anim-frame) 0.0 (* 0.01 (-> self clock time-adjust-ratio))) + (seek! (-> self anim-frame) 0.0 (/ (-> self clock time-adjust-ratio) 100)) (let ((v1-4 (-> self skel root-channel 0))) (set! (-> v1-4 num-func) num-func-identity) (let ((f0-4 (-> self anim-frame)) diff --git a/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc index 86b6bad482..30e91051ad 100644 --- a/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc @@ -407,7 +407,7 @@ (until #f (let ((f30-0 (- (-> self extent 1 y) (-> self extent 0 y)))) (when (!= f30-0 (-> self length)) - (let ((f0-3 (* 0.000010172526 f30-0))) + (let ((f0-3 (/ f30-0 (meters 24)))) (ja :num! (identity f0-3)) ) (transform-post) @@ -869,16 +869,16 @@ (set! (-> s0-0 random-rangef) f30-0) ) (if s5-0 - (set! (-> s5-0 random-rangef) (* 0.5 f28-0)) + (set! (-> s5-0 random-rangef) (/ f28-0 2)) ) (if gp-0 - (set! (-> gp-0 random-rangef) (* 0.5 f30-0)) + (set! (-> gp-0 random-rangef) (/ f30-0 2)) ) (if s4-0 - (set! (-> s5-0 random-rangef) (* 0.5 f28-0)) + (set! (-> s5-0 random-rangef) (/ f28-0 2)) ) (if v1-22 - (set! (-> gp-0 random-rangef) (* 0.5 f30-0)) + (set! (-> gp-0 random-rangef) (/ f30-0 2)) ) ) (spawn-with-matrix (-> self part) (-> self local-to-world)) @@ -901,10 +901,10 @@ (set! (-> s4-1 random-rangef) f30-0) ) (if gp-1 - (set! (-> gp-1 random-rangef) (* 0.5 f28-0)) + (set! (-> gp-1 random-rangef) (/ f28-0 2)) ) (if v1-39 - (set! (-> v1-39 random-rangef) (* 0.5 f30-0)) + (set! (-> v1-39 random-rangef) (/ f30-0 2)) ) ) (spawn-with-matrix (-> self part-off) (-> self local-to-world)) @@ -1021,9 +1021,9 @@ (set! (-> this deadly-length) (vector-vector-distance (-> s4-1 vector 2) (the-as vector (-> s4-1 vector)))) (let ((v1-39 (-> this root root-prim))) (vector-reset! (-> v1-39 local-sphere)) - (let* ((f0-14 (* 0.5 (-> this deadly-width))) + (let* ((f0-14 (/ (-> this deadly-width) 2)) (f0-16 (* f0-14 f0-14)) - (f1-7 (* 0.5 (-> this deadly-length))) + (f1-7 (/ (-> this deadly-length) 2)) ) (set! (-> v1-39 local-sphere w) (sqrtf (+ f0-16 (* f1-7 f1-7)))) ) diff --git a/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc b/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc index 42e0b5893c..dcea9678e2 100644 --- a/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc @@ -568,7 +568,7 @@ s4-0 s4-0 s5-3 - (* (fmax 0.5 (* 0.00024414062 (-> this nav state speed))) (seconds-per-frame)) + (* (fmax 0.5 (/ (-> this nav state speed) METER_LENGTH)) (seconds-per-frame)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc b/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc index 3d7f2d920d..98ad80c12f 100644 --- a/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc @@ -187,7 +187,7 @@ (go-virtual dormant) ) ) - (set! (-> *game-info* bot-health 0) (* 0.11111111 (-> self hit-points))) + (set! (-> *game-info* bot-health 0) (/ (-> self hit-points) 9)) (transform-post) (none) ) diff --git a/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc b/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc index 56dce0dd06..2a4d0c5f1d 100644 --- a/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/pegasus_REF.gc @@ -694,7 +694,7 @@ (if (not (time-elapsed? (-> self targetted-timer) (seconds 5))) (set! interpolated-speed (fmax 163840.0 interpolated-speed)) ) - (let ((movement-speed (* 0.0033333334 interpolated-speed))) + (let ((movement-speed (/ interpolated-speed 300))) (cond ((< (vector-dot dir-to-target (-> self tangent)) 0.0) (if (< 0.0 (-> self speed)) diff --git a/test/decompiler/reference/jak2/levels/forest/predator_REF.gc b/test/decompiler/reference/jak2/levels/forest/predator_REF.gc index 03ae47e508..07a3300f31 100644 --- a/test/decompiler/reference/jak2/levels/forest/predator_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/predator_REF.gc @@ -770,7 +770,7 @@ (.sub.vf vf6 vf4 vf5 :mask #b111) (.svf (&-> sv-224 quad) vf6) (let* ((f0-5 (vector-length sv-224)) - (f0-6 (* 0.0000018780048 f0-5)) + (f0-6 (/ f0-5 (meters 130))) ) (set! sv-240 (new 'stack-no-clear 'vector)) (let ((s0-0 (new 'stack-no-clear 'vector)) diff --git a/test/decompiler/reference/jak2/levels/forest/wren_REF.gc b/test/decompiler/reference/jak2/levels/forest/wren_REF.gc index e834d79dc4..6854b03a3d 100644 --- a/test/decompiler/reference/jak2/levels/forest/wren_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/wren_REF.gc @@ -330,7 +330,7 @@ (seek! (-> self fly-interp) (lerp-scale 0.0 1.0 f0-11 -0.2 0.5) (seconds-per-frame)) ) (let ((f30-1 (-> self fly-interp))) - (seek! (-> self path-du-mod) (+ 0.9 (* 0.2 f30-1)) (* 0.5 (seconds-per-frame))) + (seek! (-> self path-du-mod) (+ 0.9 (/ f30-1 5)) (* 0.5 (seconds-per-frame))) (set! (-> self bob-level-seek) (+ -12288.0 (* 24576.0 f30-1))) (let ((v1-59 (-> self skel root-channel 0))) (let ((f0-23 (- 1.0 f30-1))) diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc index 051ec05fd1..a942fe47a1 100644 --- a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc @@ -238,8 +238,8 @@ :code (behavior () (until #f (when (and (not (paused?)) (time-elapsed? (-> self state-time) (seconds 1))) - (seek! (-> self anim-frame) 0.0 (* 0.2 (-> self clock time-adjust-ratio))) - (seek! (-> self transition) 1.0 (* 0.01 (-> self clock time-adjust-ratio))) + (seek! (-> self anim-frame) 0.0 (/ (-> self clock time-adjust-ratio) 5)) + (seek! (-> self transition) 1.0 (/ (-> self clock time-adjust-ratio) 100)) ) (set-roboscreen-alpha! (-> self transition)) (ja :num-func num-func-identity :frame-num (-> self anim-frame)) @@ -266,7 +266,7 @@ :code (behavior () (until #f (when (not (paused?)) - (seek! (-> self anim-frame) 15.0 (* 0.2 (-> self clock time-adjust-ratio))) + (seek! (-> self anim-frame) 15.0 (/ (-> self clock time-adjust-ratio) 5)) (seek! (-> self transition) 0.0 (* 0.015 (-> self clock time-adjust-ratio))) ) (set-roboscreen-alpha! (-> self transition)) @@ -313,7 +313,7 @@ (gp-0 (new 'stack-no-clear 'vector)) (f30-0 4096.0) ) - (let ((f0-4 (* 0.00013563369 (tan (* 0.5 (-> *math-camera* fov))) f30-0))) + (let ((f0-4 (* 0.00013563369 (tan (/ (-> *math-camera* fov) 2)) f30-0))) (set-vector! (-> this root scale) f0-4 f0-4 f0-4 1.0) ) (set! (-> gp-0 quad) (-> (camera-pos) quad)) @@ -494,7 +494,7 @@ (let ((f0-0 (vector-length (vector-! (new 'stack-no-clear 'vector) (the-as vector gp-0) (the-as vector s5-0)))) (gp-1 (-> self sight-scale)) ) - (set! (-> gp-1 z) (* 0.000024414063 f0-0)) + (set! (-> gp-1 z) (/ f0-0 (meters 10))) (let ((f0-1 (lerp-scale 0.1 6.0 f0-0 61440.0 163840.0))) (set! (-> gp-1 x) f0-1) (set! (-> gp-1 y) f0-1) @@ -1163,7 +1163,7 @@ (let* ((f0-29 (fmax -4551.1113 (fmin 4551.1113 (- 16384.0 (acos (- (vector-dot gp-2 *y-vector*))))))) (f2-1 (- (-> self gun-elev-cam) f0-29)) (f1-12 (if (< f2-1 0.0) - (fmin 3640.889 (* (fabs (* 0.1 f2-1)) (-> self clock frames-per-second))) + (fmin 3640.889 (* (fabs (/ f2-1 10)) (-> self clock frames-per-second))) 910.2222 ) ) diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc index 3e4db6ce54..3abe303f3e 100644 --- a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc @@ -486,7 +486,7 @@ (f1-16 (- 1.0 f0-44)) (f26-0 0.0) ) - (when (and (or (< f0-44 f24-0) (< f24-0 f1-16)) (time-elapsed? (-> self buzz-timer) (the int (* 0.5 f30-2)))) + (when (and (or (< f0-44 f24-0) (< f24-0 f1-16)) (time-elapsed? (-> self buzz-timer) (the int (/ f30-2 2)))) (let* ((gp-2 *target*) (a0-43 (if (type? gp-2 process-focusable) gp-2 @@ -503,7 +503,7 @@ (-> *cpad-list* cpads 0) 1 (the int (* 255.0 (* 0.49 f26-0))) - (the-as time-frame (max 45 (the int (* 0.25 f30-2)))) + (the-as time-frame (max 45 (the int (/ f30-2 4)))) ) (set-time! (-> self buzz-timer)) ) diff --git a/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc index 0f3c2acd0d..38cd09a4f7 100644 --- a/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc @@ -262,14 +262,14 @@ (+! (-> s4-1 y) (sqrtf (- f0-6 f2-2))) ) (let* ((f0-12 (* 2.0 (asin (/ f1-4 f30-0)))) - (f28-1 (* 0.0625 f0-12)) + (f28-1 (/ f0-12 16)) (s3-1 (new 'stack-no-clear 'vector)) ) (set! (-> s3-1 x) 0.0) (set! (-> s3-1 y) (- f30-0)) (set! (-> s3-1 z) 0.0) (set! (-> s3-1 w) 0.0) - (let ((a2-2 (quaternion-vector-angle! (new 'stack-no-clear 'quaternion) gp-1 (* -0.5 f0-12)))) + (let ((a2-2 (quaternion-vector-angle! (new 'stack-no-clear 'quaternion) gp-1 (/ f0-12 -2)))) (vector-orient-by-quat! s3-1 s3-1 a2-2) ) (dotimes (s2-1 17) diff --git a/test/decompiler/reference/jak2/levels/intro/intro-scenes_REF.gc b/test/decompiler/reference/jak2/levels/intro/intro-scenes_REF.gc index 9fedc3c0c6..60fecdffec 100644 --- a/test/decompiler/reference/jak2/levels/intro/intro-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/intro/intro-scenes_REF.gc @@ -2377,7 +2377,7 @@ (let ((f0-2 1.0)) (cond ((< f30-0 2.0) - (set! f0-2 (* 0.5 f30-0)) + (set! f0-2 (/ f30-0 2)) ) ((< 3.0 f30-0) (set! f0-2 (* 0.5 (- 5.0 f30-0))) @@ -2497,7 +2497,7 @@ (let ((f0-6 1.0)) (cond ((< f30-0 2.0) - (set! f0-6 (* 0.5 f30-0)) + (set! f0-6 (/ f30-0 2)) ) ((< 6.0 f30-0) (set! f0-6 (* 0.5 (- 8.0 f30-0))) diff --git a/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc b/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc index bf7d4f6c85..5df66a958e 100644 --- a/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc @@ -522,8 +522,8 @@ (.add.mul.w.vf vf6 vf4 vf0 acc :mask #b111) (.svf (&-> a2-2 quad) vf6) ) - (let* ((a0-30 (the int (* 0.00024414062 (-> s0-1 x)))) - (a1-20 (the int (* 0.00024414062 (-> s0-1 z)))) + (let* ((a0-30 (the int (/ (-> s0-1 x) METER_LENGTH))) + (a1-20 (the int (/ (-> s0-1 z) METER_LENGTH))) (a0-32 (/ (- *dice-offset-x* a0-30) -4)) ) (if (not (logtest? (-> *dice-blocked-array* (/ (- *dice-offset-z* a1-20) -4)) (ash 1 (- 15 a0-32)))) @@ -562,8 +562,8 @@ (.add.mul.w.vf vf6 vf4 vf0 acc :mask #b111) (.svf (&-> v1-13 quad) vf6) ) - (let* ((v1-15 (the int (* 0.00024414062 (-> s0-1 x)))) - (a0-48 (the int (* 0.00024414062 (-> s0-1 z)))) + (let* ((v1-15 (the int (/ (-> s0-1 x) METER_LENGTH))) + (a0-48 (the int (/ (-> s0-1 z) METER_LENGTH))) (v1-17 (/ (- *dice-offset-x* v1-15) -4)) (a1-31 (/ (- *dice-offset-z* a0-48) -4)) ) @@ -939,8 +939,8 @@ (set! (-> self color z) (-> self color x)) (set! (-> self draw color-mult quad) (-> self color quad)) (when (zero? (-> self active)) - (let* ((v1-15 (the int (* 0.00024414062 (-> self root trans x)))) - (a0-5 (the int (* 0.00024414062 (-> self root trans z)))) + (let* ((v1-15 (the int (/ (-> self root trans x) METER_LENGTH))) + (a0-5 (the int (/ (-> self root trans z) METER_LENGTH))) (s5-0 (/ (- *dice-offset-x* v1-15) -4)) (gp-0 (/ (- *dice-offset-z* a0-5) -4)) ) @@ -1143,8 +1143,8 @@ (set! (-> v1-9 quad 2) a2-1) (set! (-> v1-9 trans quad) a3-1) ) - (let ((v1-12 (the int (+ 2.0 (* 0.00024414062 (-> s1-0 trans x))))) - (a0-14 (the int (+ 2.0 (* 0.00024414062 (-> s1-0 trans z))))) + (let ((v1-12 (the int (+ 2.0 (/ (-> s1-0 trans x) METER_LENGTH)))) + (a0-14 (the int (+ 2.0 (/ (-> s1-0 trans z) METER_LENGTH)))) ) (set! sv-544 (/ (- *dice-offset-x* v1-12) -4)) (let ((s0-0 (/ (- *dice-offset-z* a0-14) -4))) @@ -1231,8 +1231,8 @@ (set! (-> sv-608 y) (get-ripple-height s0-1 sv-608)) (vector-! sv-576 sv-576 sv-560) (vector-! sv-608 sv-608 sv-560) - (set! (-> sv-576 y) (* 0.5 (-> sv-576 y))) - (set! (-> sv-608 y) (* 0.5 (-> sv-608 y))) + (set! (-> sv-576 y) (/ (-> sv-576 y) 2)) + (set! (-> sv-608 y) (/ (-> sv-608 y) 2)) (set! (-> sv-576 w) 0.0) (set! (-> sv-592 w) 0.0) (set! (-> sv-608 w) 0.0) @@ -1444,9 +1444,9 @@ (set! (-> this first) (the-as uint 1)) ) ) - (let* ((a0-48 (the int (* 0.00024414062 (-> this root trans x)))) - (v1-37 (the int (* 0.00024414062 (-> this root trans y)))) - (a1-21 (the int (* 0.00024414062 (-> this root trans z)))) + (let* ((a0-48 (the int (/ (-> this root trans x) METER_LENGTH))) + (v1-37 (the int (/ (-> this root trans y) METER_LENGTH))) + (a1-21 (the int (/ (-> this root trans z) METER_LENGTH))) (a0-49 (- a0-48 *dice-offset-x*)) (a2-13 (- a1-21 *dice-offset-z*)) (a1-22 (+ a0-49 1)) @@ -2214,7 +2214,7 @@ (gp-0 (-> self draw shadow-ctrl)) ) (vector<-cspace! (-> self root trans) s5-0) - (let ((f0-1 (* 0.5 (-> s5-0 bone scale y)))) + (let ((f0-1 (/ (-> s5-0 bone scale y) 2))) (set-vector! (-> self root scale) f0-1 f0-1 f0-1 1.0) ) (cond @@ -2529,7 +2529,7 @@ ) ) (when (< f30-0 122880.0) - (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 (the int (* 255.0 (- 1.0 (* 0.000008138021 f30-0)))) (seconds 0.2)) + (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 (the int (* 255.0 (- 1.0 (/ f30-0 (meters 30))))) (seconds 0.2)) (activate! *camera-smush-control* (lerp-scale 1638.4 0.0 f30-0 0.0 122880.0) diff --git a/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc b/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc index 980d855a32..0df643b08e 100644 --- a/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc @@ -991,7 +991,7 @@ (the int (* 2.0 f30-0)) ) (else - (the int (* 0.5 f30-0)) + (the int (/ f30-0 2)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-extras_REF.gc b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-extras_REF.gc index 58d65fefc6..370e7451ca 100644 --- a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-extras_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-extras_REF.gc @@ -654,7 +654,7 @@ (set! (-> self foot-locks s4-0 lock target) 1.0) ) (else - (vector+float*! s3-0 (-> gp-0 start-pos) (-> gp-0 move-dist) (- f0-12 (* 0.000013563368 f1-2))) + (vector+float*! s3-0 (-> gp-0 start-pos) (-> gp-0 move-dist) (- f0-12 (/ f1-2 (meters 18)))) (set! (-> self foot-locks s4-0 lock target) 0.0) ) ) @@ -1010,7 +1010,7 @@ (set! f28-0 0.0) ) (else - (* 0.5 f26-0) + (/ f26-0 2) ) ) ) @@ -1862,7 +1862,7 @@ (f30-0 (vector-normalize-ret-len! gp-1 1.0)) ) (quaternion-from-two-vectors! (-> self root quat) (new 'static 'vector :y -1.0) gp-1) - (set! (-> self root scale y) (* 0.000009042245 f30-0)) + (set! (-> self root scale y) (/ f30-0 (meters 27))) ) ) :code sleep-code @@ -1923,7 +1923,7 @@ (gp-2 (vector-! (new 'stack-no-clear 'vector) s5-0 (-> self target-pos))) ) (let ((f0-4 (vector-normalize-ret-len! gp-2 1.0))) - (set! (-> self root scale y) (* 0.000009042245 f0-4)) + (set! (-> self root scale y) (/ f0-4 (meters 27))) (vector+float*! (-> self root trans) s5-0 gp-2 (- f0-4)) ) (quaternion-from-two-vectors! (-> self root quat) (new 'static 'vector :y -1.0) gp-2) @@ -2110,7 +2110,7 @@ (gp-0 (new 'stack-no-clear 'vector)) ) (let ((f30-0 4096.0)) - (let ((f28-1 (* 0.00013563369 (tan (* 0.5 (-> *math-camera* fov))) f30-0))) + (let ((f28-1 (* 0.00013563369 (tan (/ (-> *math-camera* fov) 2)) f30-0))) (matrix->quaternion (-> self root quat) s5-0) (set-vector! (-> self root scale) f28-1 f28-1 f28-1 1.0) ) 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 0320bc0460..15ee99b30c 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 @@ -708,10 +708,10 @@ ) ) ((= (-> self stage) 3) - (* 0.004 f28-0) + (/ f28-0 250) ) (else - (* 0.008 f28-0) + (/ f28-0 125) ) ) ) @@ -1408,7 +1408,7 @@ ) ) (when (!= f30-0 0.0) - (matrix-axis-angle! s5-0 (-> gp-0 vector 1) (* 0.5 (-> self clock time-adjust-ratio) f30-0)) + (matrix-axis-angle! s5-0 (-> gp-0 vector 1) (* (/ (-> self clock time-adjust-ratio) 2) f30-0)) (matrix*! gp-0 gp-0 s5-0) (matrix-remove-z-rot gp-0 (new 'static 'vector :y -1.0)) (matrix->quaternion (-> self root quat) gp-0) @@ -1992,7 +1992,7 @@ (s4-0 (new 'stack-no-clear 'vector)) ) (let ((s3-0 (new 'stack-no-clear 'vector))) - (let ((f30-0 (* 4096.0 (* 0.25 (-> self clock time-adjust-ratio)))) + (let ((f30-0 (* 4096.0 (/ (-> self clock time-adjust-ratio) 4))) (s1-0 #f) ) (set! (-> s3-0 quad) (-> self root trans quad)) diff --git a/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc b/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc index ee0d8bf0c8..21e8d6c211 100644 --- a/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/boss/nestb-scenes_REF.gc @@ -432,7 +432,7 @@ (launch-particles (-> *part-id-table* 622) s3-2) ) (let ((s4-1 (new 'stack-no-clear 'matrix)) - (f26-0 (* 0.000020345053 f30-0)) + (f26-0 (/ f30-0 (meters 12))) (f30-1 (-> *part-id-table* 623 init-specs 3 initial-valuef)) (f28-1 (-> *part-id-table* 623 init-specs 5 initial-valuef)) ) 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 3b7c6d0d2d..ae453a5ee9 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 @@ -3133,7 +3133,7 @@ (launch-particles (-> *part-id-table* 4859) s4-1) ) (let ((s4-2 (new 'stack-no-clear 'matrix)) - (f26-0 (* 0.000012207031 f30-0)) + (f26-0 (/ f30-0 (meters 20))) (f30-1 (-> *part-id-table* 4860 init-specs 3 initial-valuef)) (f28-0 (-> *part-id-table* 4860 init-specs 4 initial-valuef)) ) 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 dfd274418d..f3e1c87618 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 @@ -1456,7 +1456,7 @@ ) ) (set! (-> self gun-tilt) (fmin 8192.0 (fmax -8192.0 (-> self gun-tilt)))) - (let ((f30-2 (* 0.5 (-> self gun-tilt)))) + (let ((f30-2 (/ (-> self gun-tilt) 2))) (quaternion-set! (-> self gun-tilt-left-jm quat) (sin f30-2) 0.0 0.0 (cos f30-2)) ) (quaternion-copy! (-> self gun-tilt-right-jm quat) (-> self gun-tilt-left-jm quat)) diff --git a/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc b/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc index 1b2b34f10a..5df5b4b0e7 100644 --- a/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc @@ -183,7 +183,7 @@ (s1-0 (quaternion-rotate-local-z! (new 'stack-no-clear 'quaternion) (-> self root quat) - (+ (-> s4-0 z-rotate) (* 0.2 f28-0)) + (+ (-> s4-0 z-rotate) (/ f28-0 5)) ) ) ) @@ -627,7 +627,7 @@ (launch-particles (-> *part-id-table* 608) s4-1) ) (let ((s4-2 (new 'stack-no-clear 'matrix)) - (f22-0 (* 0.000027126736 f30-0)) + (f22-0 (/ f30-0 (meters 9))) (f30-1 (-> *part-id-table* 609 init-specs 3 initial-valuef)) (f28-1 (-> *part-id-table* 609 init-specs 4 initial-valuef)) (f26-1 (-> *part-id-table* 609 init-specs 1 initial-valuef)) diff --git a/test/decompiler/reference/jak2/levels/palace/throne/metalkor-texture_REF.gc b/test/decompiler/reference/jak2/levels/palace/throne/metalkor-texture_REF.gc index c151974a86..e08e63147f 100644 --- a/test/decompiler/reference/jak2/levels/palace/throne/metalkor-texture_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/throne/metalkor-texture_REF.gc @@ -160,8 +160,8 @@ ) (else (let ((f0-16 (+ 0.1 (* (-> s5-0 extra w) (sin (* 32768.0 (/ (-> s5-0 extra y) (-> s5-0 extra z)))))))) - (set-vector! (-> s5-0 start-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) - (set-vector! (-> s5-0 end-color) (* 0.5 f0-16) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 start-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) + (set-vector! (-> s5-0 end-color) (/ f0-16 2) (* 0.7 f0-16) f0-16 1.0) ) (set! (-> s5-0 extra y) (- (-> s5-0 extra y) (* 300.0 (seconds-per-frame)))) ) diff --git a/test/decompiler/reference/jak2/levels/ruins/mechtest-obs_REF.gc b/test/decompiler/reference/jak2/levels/ruins/mechtest-obs_REF.gc index dbfea2b084..5578396ab1 100644 --- a/test/decompiler/reference/jak2/levels/ruins/mechtest-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/mechtest-obs_REF.gc @@ -211,7 +211,7 @@ ) ) ) - (vector-float*! (-> s4-0 transv) s3-0 (* 0.1 (-> self clock frames-per-second))) + (vector-float*! (-> s4-0 transv) s3-0 (/ (-> self clock frames-per-second) 10)) ) (let ((v1-35 (-> s4-0 root-prim))) (set! (-> v1-35 prim-core collide-as) (-> s4-0 backup-collide-as)) diff --git a/test/decompiler/reference/jak2/levels/ruins/pillar-collapse_REF.gc b/test/decompiler/reference/jak2/levels/ruins/pillar-collapse_REF.gc index 4c9ee63545..aa5f718261 100644 --- a/test/decompiler/reference/jak2/levels/ruins/pillar-collapse_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/pillar-collapse_REF.gc @@ -82,7 +82,7 @@ (a0-8 (-> gp-1 mode)) (v1-6 (cond ((= a0-8 'mech-punch) - (and (< f1-1 0.0) (< (fabs (* 0.5 f0-3)) (fabs f1-1))) + (and (< f1-1 0.0) (< (fabs (/ f0-3 2)) (fabs f1-1))) ) ((= a0-8 'crush) (< (sqrtf (+ (* (-> v1-4 x) (-> v1-4 x)) (* (-> v1-4 z) (-> v1-4 z)))) 40960.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 70525406a2..cb723bcc4e 100644 --- a/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc @@ -862,7 +862,7 @@ (seek-to-point-toward-point! (-> self root) (get-trans (the-as process-focusable a0-2) 3) - (* 0.5 (-> self nav max-rotation-rate)) + (/ (-> self nav max-rotation-rate) 2) (seconds 0.5) ) ) diff --git a/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc b/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc index e6098c9305..78701d038f 100644 --- a/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc @@ -338,7 +338,7 @@ (f28-0 (seek-ease f0-8 0.0 - (* (lerp 21299.2 8192.0 (* 0.000005086263 (-> self spin-rate))) (seconds-per-frame)) + (* (lerp 21299.2 8192.0 (/ (-> self spin-rate) (meters 48))) (seconds-per-frame)) 12288.0 2.0 ) 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 226d6d4429..3ae62b2048 100644 --- a/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc @@ -681,7 +681,7 @@ ) (rigid-body-method-18 (-> v1-27 state) a1-12 a2-3) ) - (vector-normalize-copy! s5-0 *y-vector* (* 0.5 f30-0 f28-0 (-> this escort-force 0 y))) + (vector-normalize-copy! s5-0 *y-vector* (* (/ f30-0 2) f28-0 (-> this escort-force 0 y))) (vector-orient-by-quat! gp-0 (-> *rift-rider-force-points* 1) (-> this root quat)) (vector+! gp-0 gp-0 (-> this root trans)) (let ((v1-34 (-> this rbody)) @@ -698,7 +698,7 @@ ) (rigid-body-method-18 (-> v1-40 state) a1-21 a2-8) ) - (vector-normalize-copy! s5-0 *y-vector* (* 0.5 f30-0 f28-0 (-> this escort-force 1 y))) + (vector-normalize-copy! s5-0 *y-vector* (* (/ f30-0 2) f28-0 (-> this escort-force 1 y))) ) ) (vector-orient-by-quat! gp-0 (-> *rift-rider-force-points* 3) (-> this root quat)) @@ -1787,7 +1787,7 @@ (ja-no-eval :group! (-> self draw art-group data (-> self walk-anim)) :num! (loop!) :frame-num 0.0) (until #f (suspend) - (let ((f0-3 (fmax 0.2 (* 0.00008138021 (-> self observed-speed))))) + (let ((f0-3 (fmax 0.2 (/ (-> self observed-speed) (meters 3))))) (ja :num! (loop! f0-3)) ) ) @@ -2292,7 +2292,7 @@ ) (until #f (suspend) - (let ((f30-0 (fmax 0.2 (* 0.00008138021 (-> self observed-speed)))) + (let ((f30-0 (fmax 0.2 (/ (-> self observed-speed) (meters 3)))) (f28-0 0.0) ) (let ((a1-3 (new 'stack-no-clear 'event-message-block))) diff --git a/test/decompiler/reference/jak2/levels/tomb/widow-baron_REF.gc b/test/decompiler/reference/jak2/levels/tomb/widow-baron_REF.gc index 52c7d261e7..f1217846a1 100644 --- a/test/decompiler/reference/jak2/levels/tomb/widow-baron_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/widow-baron_REF.gc @@ -148,8 +148,8 @@ (defmethod init ((this widow-rand-vector) (arg0 int) (arg1 int) (arg2 float) (arg3 float)) (set! (-> this min-time) arg0) (set! (-> this max-time) arg1) - (set! (-> this xz-max) (* 0.5 arg2)) - (set! (-> this y-max) (* 0.5 arg3)) + (set! (-> this xz-max) (/ arg2 2)) + (set! (-> this y-max) (/ arg3 2)) (set! (-> this timer) 0) (vector-reset! (-> this value)) 0 diff --git a/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc b/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc index bc0904a2df..24b5efa139 100644 --- a/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc @@ -661,21 +661,21 @@ ) (let ((s3-0 quaternion-set!) (s2-0 s5-0) - (s1-0 (sin (* 0.5 (-> this x-rotate)))) + (s1-0 (sin (/ (-> this x-rotate) 2))) (s0-0 0.0) ) (set! sv-48 (the-as float 0.0)) - (let ((t0-0 (cos (* 0.5 (-> this x-rotate))))) + (let ((t0-0 (cos (/ (-> this x-rotate) 2)))) (s3-0 s2-0 s1-0 s0-0 sv-48 t0-0) ) ) (let ((s3-1 quaternion-set!) (s2-1 gp-0) (s1-1 0.0) - (s0-1 (sin (* 0.5 (-> this y-rotate)))) + (s0-1 (sin (/ (-> this y-rotate) 2))) ) (set! sv-64 (the-as float 0.0)) - (let ((t0-1 (cos (* 0.5 (-> this y-rotate))))) + (let ((t0-1 (cos (/ (-> this y-rotate) 2)))) (s3-1 s2-1 s1-1 s0-1 sv-64 t0-1) ) ) @@ -1357,7 +1357,7 @@ (vector-! v1-42 arg1 arg0) (set! (-> v1-42 y) 0.0) (let ((f30-1 (atan (-> v1-42 x) (-> v1-42 z)))) - (quaternion-set! (-> self root quat) 0.0 (sin (* 0.5 f30-1)) 0.0 (cos (* 0.5 f30-1))) + (quaternion-set! (-> self root quat) 0.0 (sin (/ f30-1 2)) 0.0 (cos (/ f30-1 2))) ) ) (set! (-> self which-trajectory) 0) diff --git a/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc b/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc index e9915eb956..5cb1b78fa9 100644 --- a/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc @@ -1050,7 +1050,7 @@ (vector-normalize! s3-1 f28-0) (vector+! (-> this charge-pos) s5-0 s3-1) (let ((f30-0 f28-0) - (f28-1 (* 0.000024414063 f28-0)) + (f28-1 (/ f28-0 (meters 10))) (s3-2 0) (s2-0 (new 'stack-no-clear 'vector)) (s1-0 (new 'stack-no-clear 'vector)) diff --git a/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc b/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc index dbe5a5a50c..1939d6eb64 100644 --- a/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc @@ -1504,7 +1504,7 @@ s5-1 ) (vector-normalize! s5-1 1.0) - (vector-seek-3d-smooth! (-> gp-1 vector 1) s5-1 (* 0.5 (-> self clock time-adjust-ratio)) 0.5) + (vector-seek-3d-smooth! (-> gp-1 vector 1) s5-1 (/ (-> self clock time-adjust-ratio) 2) 0.5) (vector-normalize! s5-1 1.0) (quaternion-from-two-vectors-partial! (-> self head-mod quat) diff --git a/test/decompiler/reference/jak2/levels/under/underb-master_REF.gc b/test/decompiler/reference/jak2/levels/under/underb-master_REF.gc index 06cd317012..c722824b17 100644 --- a/test/decompiler/reference/jak2/levels/under/underb-master_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/underb-master_REF.gc @@ -92,7 +92,7 @@ (gp-0 (new 'stack-no-clear 'vector)) (f30-0 4096.0) ) - (let ((f0-4 (* 0.00013563369 (tan (* 0.5 (-> *math-camera* fov))) f30-0))) + (let ((f0-4 (* 0.00013563369 (tan (/ (-> *math-camera* fov) 2)) f30-0))) (set-vector! (-> this root scale) f0-4 f0-4 f0-4 1.0) ) (set! (-> gp-0 quad) (-> (camera-pos) quad))