[decomp] sync-info 1

decompiler/config/all-types.gc

@@ -3109,13 +3109,8 @@
   :flag-assert         #x900000080
   )
 
-;;(define-extern display-env object) ;; unknown type
-;;(define-extern display-frame object) ;; unknown type
-;;(define-extern display object) ;; unknown type
 ;;(define-extern *post-draw-hook* object) ;; unknown type
-;;(define-extern virtual-frame object) ;; unknown type
 (define-extern put-draw-env (function dma-packet none))
-;;(define-extern draw-env object) ;; unknown type
 ;;(define-extern *pre-draw-hook* object) ;; unknown type
 
 
@@ -3151,7 +3146,6 @@
   :flag-assert         #x900000014
   )
 
-;; display-h
 (deftype display (basic)
   ((display-env0                    display-env :inline :offset-assert 8)
    (display-env1                    display-env :inline :offset-assert 48)
@@ -8398,15 +8392,15 @@
   :size-assert         #x8
   :flag-assert         #x1200000008
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
-    (dummy-11 () none 11)
-    (dummy-12 () none 12)
-    (dummy-13 () none 13)
-    (dummy-14 () none 14)
-    (dummy-15 () none 15)
-    (dummy-16 () none 16)
-    (dummy-17 () none 17)
+    (dummy-9 (_type_ float) float 9)
+    (dummy-10 (_type_) float 10)
+    (dummy-11 (_type_) float 11)
+    (dummy-12 (_type_ float) float 12)
+    (dummy-13 (_type_) float 13)
+    (dummy-14 (_type_ uint float float float) int 14) ;; 3 arg for parent 5 for child
+    (dummy-15 (_type_) float 15) ;; wip
+    (dummy-16 (_type_ float) float 16)
+    (dummy-17 (_type_) float 17)
     )
   )
 
@@ -8422,15 +8416,15 @@
   :size-assert         #x1c
   :flag-assert         #x120000001c
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
-    (dummy-11 () none 11)
-    (dummy-12 () none 12)
-    (dummy-13 () none 13)
-    (dummy-14 () none 14)
-    (dummy-15 () none 15)
-    (dummy-16 () none 16)
-    (dummy-17 () none 17)
+    ;; (dummy-9 () none 9)
+    ;; (dummy-10 () none 10)
+    ;; (dummy-11 () none 11)
+    (dummy-12 (_type_ float) float 12)
+    (dummy-13 (_type_) float 13)
+    (dummy-14 (_type_ uint float float float) int 14)
+    (dummy-15 (_type_) float 15) ;; wip
+    ;; (dummy-16 () none 16)
+    ;; (dummy-17 () none 17)
     )
   )
 
@@ -8443,15 +8437,15 @@
   :size-assert         #x10
   :flag-assert         #x1200000010
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
-    (dummy-11 () none 11)
-    (dummy-12 () none 12)
-    (dummy-13 () none 13)
-    (dummy-14 () none 14)
-    (dummy-15 () none 15)
-    (dummy-16 () none 16)
-    (dummy-17 () none 17)
+    (dummy-9 (_type_ float) float 9)
+    ;; (dummy-10 () none 10)
+    (dummy-11 (_type_) float 11)
+    (dummy-12 (_type_ float) float 12)
+    (dummy-13 (_type_) float 13)
+    (dummy-14 (_type_ uint float float float) int 14)
+    (dummy-15 (_type_) float 15) ;; wip
+    ;; (dummy-16 () none 16)
+    ;; (dummy-17 () none 17)
     )
   )
 
@@ -8468,8 +8462,8 @@
   :size-assert         #x1c
   :flag-assert         #xb0000001c
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
+    (dummy-9 (_type_ int int float) float 9)
+    (dummy-10 (_type_ ) float 10)
     )
   )
 
@@ -8486,8 +8480,8 @@
   :size-assert         #x18
   :flag-assert         #xb00000018
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
+    (dummy-9 (_type_ float float float float) float 9)
+    (dummy-10 (_type_ float) float 10)
     )
   )
 
@@ -8503,10 +8497,10 @@
   :size-assert         #x28
   :flag-assert         #xd00000028
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
-    (dummy-11 () none 11)
-    (dummy-12 () none 12)
+    (dummy-9 (_type_ float float float float float float float) float 9)
+    (dummy-10 (_type_ float) float 10)
+    (dummy-11 (_type_) symbol 11) ;; bool
+    (dummy-12 (_type_) symbol 12) ;; bool
     )
   )
 
@@ -8524,10 +8518,10 @@
   :size-assert         #x30
   :flag-assert         #xd00000030
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
-    (dummy-11 () none 11)
-    (dummy-12 () none 12)
+    (dummy-9 (_type_ int int float float) vector 9)
+    (dummy-10 (_type_) vector 10)
+    (dummy-11 (_type_) vector 11)
+    (dummy-12 (_type_) vector 12)
     )
   )
 
@@ -8544,8 +8538,8 @@
   :size-assert         #x3c
   :flag-assert         #xb0000003c
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
+    (dummy-9 (_type_ vector float float float) vector 9)
+    (dummy-10 (_type_ vector) vector 10)
     )
   )
 
@@ -32672,8 +32666,6 @@
 ;;(define-extern cpad-open object) ;; unknown type
 
 
-;;(define-extern *display* object) ;; unknown type
-
 ;;(define-extern load-dir object) ;; unknown type
 ;;(define-extern external-art-buffer object) ;; unknown type
 ;;(define-extern load-dir-art-group object) ;; unknown type
@@ -33245,7 +33237,6 @@
 ;;(define-extern *debug-engine* object) ;; unknown type
 ;;(define-extern res-tag object) ;; unknown type
 ;;(define-extern *res-key-string* object) ;; unknown type
-(define-extern res-lump type)
 ;;(define-extern *res-static-buf* object) ;; unknown type
 (define-extern part-group-pointer? function)
 (define-extern nav-mesh type)
@@ -33324,14 +33315,6 @@
 ;;(define-extern touch-tracker object) ;; unknown type
 ;;(define-extern part-tracker object) ;; unknown type
 ;;(define-extern pov-camera object) ;; unknown type
-;;(define-extern delayed-rand-float object) ;; unknown type
-;;(define-extern sync-info-paused object) ;; unknown type
-;;(define-extern bouncing-float object) ;; unknown type
-;;(define-extern delayed-rand-vector object) ;; unknown type
-;;(define-extern sync-info object) ;; unknown type
-;;(define-extern oscillating-vector object) ;; unknown type
-;;(define-extern sync-info-eased object) ;; unknown type
-;;(define-extern oscillating-float object) ;; unknown type
 ;;(define-extern smush-control object) ;; unknown type
 ;;(define-extern trajectory object) ;; unknown type
 ;;(define-extern joint-mod-wheel object) ;; unknown type

decompiler/config/jak1_ntsc_black_label.jsonc

@@ -502,7 +502,13 @@
         "(anon-function 43 maincave-obs)",
         "(anon-function 2 target-tube)",
         "(anon-function 5 orbit-plat)",
-        "(anon-function 2 ogreboss)"
+        "(anon-function 2 ogreboss)",
+
+		// not enough type info to decompile these
+		// (these are NOT actually asm functions)
+		"(method 15 sync-info)", // NEED *res-static-buf*
+		"(method 15 sync-info-eased)", // NEED *res-static-buf*
+		"(method 15 sync-info-paused)" // NEED *res-static-buf*
     ],
 
 "pair_functions_by_name":["ref", "last", "member", "nmember", "assoc", "assoce", "append!", "delete!", "delete-car!",

decompiler/config/jak1_ntsc_black_label/label_types.jsonc

@@ -334,6 +334,18 @@
 
   "fact-h": [["L35", "_auto_", true]],
 
+  "sync-info": [
+    ["L78", "float", true],
+    ["L79", "float", true],
+    ["L80", "float", true],
+    ["L81", "float", true],
+    ["L82", "float", true],
+    ["L83", "float", true],
+    ["L84", "float", true],
+    ["L85", "float", true],
+    ["L86", "float", true]
+  ],
+
   "smush-control-h": [
     ["L20", "float", true],
     ["L18", "float", true],

decompiler/config/jak1_ntsc_black_label/stack_vars.jsonc

@@ -132,5 +132,7 @@
   "vector-deg-seek": [[16, "matrix"]],
   "vector-deg-slerp": [[16, "matrix"], [80, "vector"], [96, "vector"]],
 
-  "circle-test": [[16, "sphere"], [32, "sphere"], [48, "vector"], [64, "vector"]]
-} 
+  "circle-test": [[16, "sphere"], [32, "sphere"], [48, "vector"], [64, "vector"]],
+
+  "(method 10 oscillating-vector)":[[16, "vector"]]
+}

goal_src/engine/physics/dynamics-h.gc

@@ -52,7 +52,7 @@
          :gravity-length GRAVITY_AMOUNT
          :gravity  (new 'static 'vector :x 0.0 :y GRAVITY_AMOUNT :z 0.0 :w 1.0)
          :gravity-normal (new 'static 'vector :x 0.0 :y 1.0 :z 0.0 :w 1.0)
-         :walk-distance 8192.0
-         :run-distance 20480.0
+         :walk-distance (meters 2)
+         :run-distance (meters 5)
          )
   )

goal_src/engine/physics/gravity-h.gc

@@ -6,5 +6,5 @@
 ;; dgos: GAME, ENGINE
 
 ;; This file generates no code.
-(defconstant GRAVITY_AMOUNT 245760.0) ;; (meters 60)
-(defconstant GRAVITY_MAX 163840.0) ;; (meters 40)
+(defconstant GRAVITY_AMOUNT (meters 60)) ;; gravity force
+(defconstant GRAVITY_MAX (meters 40)) ;; regular terminal velocity

goal_src/engine/util/sync-info-h.gc

@@ -13,15 +13,15 @@
   :size-assert         #x8
   :flag-assert         #x1200000008
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
-    (dummy-11 () none 11)
-    (dummy-12 () none 12)
-    (dummy-13 () none 13)
-    (dummy-14 () none 14)
-    (dummy-15 () none 15)
-    (dummy-16 () none 16)
-    (dummy-17 () none 17)
+    (dummy-9 (_type_ float) float 9)
+    (dummy-10 (_type_) float 10)
+    (dummy-11 (_type_) float 11)
+    (dummy-12 (_type_ float) float 12)
+    (dummy-13 (_type_) float 13)
+    (dummy-14 (_type_ uint float float float) int 14)
+    (dummy-15 (_type_) float 15) ;; wip
+    (dummy-16 (_type_ float) float 16)
+    (dummy-17 (_type_) float 17)
     )
   )
 
@@ -36,15 +36,15 @@
   :size-assert         #x1c
   :flag-assert         #x120000001c
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
-    (dummy-11 () none 11)
-    (dummy-12 () none 12)
-    (dummy-13 () none 13)
-    (dummy-14 () none 14)
-    (dummy-15 () none 15)
-    (dummy-16 () none 16)
-    (dummy-17 () none 17)
+    ;; (dummy-9 () none 9)
+    ;; (dummy-10 () none 10)
+    ;; (dummy-11 () none 11)
+    (dummy-12 (_type_ float) float 12)
+    (dummy-13 (_type_) float 13)
+    (dummy-14 (_type_ uint float float float) int 14)
+    (dummy-15 (_type_) float 15) ;; wip
+    ;; (dummy-16 () none 16)
+    ;; (dummy-17 () none 17)
     )
   )
 
@@ -56,15 +56,15 @@
   :size-assert         #x10
   :flag-assert         #x1200000010
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
-    (dummy-11 () none 11)
-    (dummy-12 () none 12)
-    (dummy-13 () none 13)
-    (dummy-14 () none 14)
-    (dummy-15 () none 15)
-    (dummy-16 () none 16)
-    (dummy-17 () none 17)
+    (dummy-9 (_type_ float) float 9)
+    ;; (dummy-10 () none 10)
+    (dummy-11 (_type_) float 11)
+    (dummy-12 (_type_ float) float 12)
+    (dummy-13 (_type_) float 13)
+    (dummy-14 (_type_ uint float float float) int 14)
+    (dummy-15 (_type_) float 15) ;; wip
+    ;; (dummy-16 () none 16)
+    ;; (dummy-17 () none 17)
     )
   )
 
@@ -80,8 +80,8 @@
   :size-assert         #x1c
   :flag-assert         #xb0000001c
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
+    (dummy-9 (_type_ int int float) float 9)
+    (dummy-10 (_type_ ) float 10)
     )
   )
 
@@ -97,8 +97,8 @@
   :size-assert         #x18
   :flag-assert         #xb00000018
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
+    (dummy-9 (_type_ float float float float) float 9)
+    (dummy-10 (_type_ float) float 10)
     )
   )
 
@@ -113,10 +113,10 @@
   :size-assert         #x28
   :flag-assert         #xd00000028
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
-    (dummy-11 () none 11)
-    (dummy-12 () none 12)
+    (dummy-9 (_type_ float float float float float float float) float 9)
+    (dummy-10 (_type_ float) float 10)
+    (dummy-11 (_type_) symbol 11) ;; bool
+    (dummy-12 (_type_) symbol 12) ;; bool
     )
   )
 
@@ -133,10 +133,10 @@
   :size-assert         #x30
   :flag-assert         #xd00000030
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
-    (dummy-11 () none 11)
-    (dummy-12 () none 12)
+    (dummy-9 (_type_ int int float float) vector 9)
+    (dummy-10 (_type_) vector 10)
+    (dummy-11 (_type_) vector 11)
+    (dummy-12 (_type_) vector 12)
     )
   )
 
@@ -152,7 +152,7 @@
   :size-assert         #x3c
   :flag-assert         #xb0000003c
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
+    (dummy-9 (_type_ vector float float float) vector 9)
+    (dummy-10 (_type_ vector) vector 10)
     )
   )