decomp: finallize water-anim

decompiler/config/all-types.gc

@@ -17744,10 +17744,10 @@
   (:methods
     (water-vol-idle () none 20) ;; state
     (water-vol-startup () none 21) ;; state
-    (dummy-22 (_type_) none 22)
+    (TODO-RENAME-22 (_type_) none 22)
     (dummy-23 () none 23)
     (dummy-24 () none 24)
-    (TODO-RENAME-25 (_type_) none 25)
+    (TODO-RENAME-25 (_type_) quaternion 25)
     (dummy-26 () none 26)
     (dummy-27 () none 27)
     (get-ripple-height (_type_ vector) float 28)
@@ -21870,7 +21870,7 @@
   )
 
 (deftype water-anim-look (structure)
-  ((skel-group         skeleton-group  :offset-assert 0)
+  ((skel-group         symbol  :offset-assert 0)
    (anim               int32  :offset-assert 4)
    (ambient-sound-spec sound-spec  :offset-assert 8)
    )
@@ -21950,14 +21950,6 @@
   (:methods
     (water-vol-idle () none 20) ;; state
     (water-vol-startup () none 21) ;; state
-    (dummy-22 () none 22)
-    (dummy-23 () none 23)
-    (dummy-24 () none 24)
-    (dummy-25 () none 25)
-    (dummy-26 () none 26)
-    (dummy-27 () none 27)
-    (dummy-28 () none 28)
-    (dummy-29 () none 29)
     )
   )
 

decompiler/config/jak1_ntsc_black_label/label_types.jsonc

@@ -1422,6 +1422,59 @@
   ],
 
   "water-anim": [
+    ["L13", "_lambda_", true],
+    ["L15", "_lambda_", true],
+    ["L21", "_lambda_", true],
+    ["L26", "state", true],
+    ["L27", "_auto_", true],
+    ["L99", "skeleton-group", true],
+    ["L101", "skeleton-group", true],
+    ["L102", "skeleton-group", true],
+    ["L103", "skeleton-group", true],
+    ["L104", "skeleton-group", true],
+    ["L106", "skeleton-group", true],
+    ["L108", "skeleton-group", true],
+    ["L110", "skeleton-group", true],
+    ["L111", "skeleton-group", true],
+    ["L113", "skeleton-group", true],
+    ["L115", "skeleton-group", true],
+    ["L117", "skeleton-group", true],
+    ["L119", "skeleton-group", true],
+    ["L121", "skeleton-group", true],
+    ["L123", "skeleton-group", true],
+    ["L124", "skeleton-group", true],
+    ["L125", "skeleton-group", true],
+    ["L126", "skeleton-group", true],
+    ["L127", "skeleton-group", true],
+    ["L128", "skeleton-group", true],
+    ["L129", "skeleton-group", true],
+    ["L130", "skeleton-group", true],
+    ["L131", "skeleton-group", true],
+    ["L132", "skeleton-group", true],
+    ["L133", "skeleton-group", true],
+    ["L134", "skeleton-group", true],
+    ["L136", "skeleton-group", true],
+    ["L138", "skeleton-group", true],
+    ["L140", "skeleton-group", true],
+    ["L141", "skeleton-group", true],
+    ["L142", "skeleton-group", true],
+    ["L143", "skeleton-group", true],
+    ["L144", "skeleton-group", true],
+    ["L146", "skeleton-group", true],
+    ["L147", "skeleton-group", true],
+    ["L148", "skeleton-group", true],
+    ["L149", "skeleton-group", true],
+    ["L150", "skeleton-group", true],
+    ["L151", "skeleton-group", true],
+    ["L152", "skeleton-group", true],
+    ["L153", "skeleton-group", true],
+    ["L154", "skeleton-group", true],
+    ["L155", "skeleton-group", true],
+    ["L156", "skeleton-group", true],
+    ["L157", "skeleton-group", true],
+    ["L159", "skeleton-group", true],
+    ["L160", "skeleton-group", true],
+    ["L161", "skeleton-group", true],
     ["L163", "float", true],
     ["L165", "float", true]
   ],

decompiler/config/jak1_ntsc_black_label/type_casts.jsonc

@@ -1792,12 +1792,11 @@
   // ],
 
   "(anon-function 6 water-anim)": [
-    [[0, 999], "s6", "water-anim"],
     [6, "a0", "vector"]
   ],
 
   "(anon-function 5 water-anim)": [
-    [[0, 999], "s6", "water-anim"]
+    [2, "v1", "(state none)"]
   ],
 
   "rigid-body-platform-post": [
@@ -1826,14 +1825,15 @@
     [[0, 5], "t9", "(function object)"]
   ],
 
-  "(anon-function 4 water-anim)": [
-    [[0, 999], "s6", "water-anim"]
-  ],
-
   "(method 22 water-anim)": [
     [[9, 14], "t9", "(function object object)"],
+    [25, "s3", "basic"],
     [[32, 37], "t9", "(function object object)"]
   ],
 
+  "(method 25 water-anim)": [
+    [[27, 45], "v1", "transform"] // mostly a guess, manipulating a trsqv
+  ],
+
   "placeholder-do-not-add-below": []
 }

goal_src/engine/draw/process-drawable.gc

@@ -5,3 +5,5 @@
 ;; name in dgo: process-drawable
 ;; dgos: GAME, ENGINE
 
+;; TODO - for water-anim
+(define-extern ja-post (function int))

goal_src/engine/gfx/ripple.gc

@@ -149,7 +149,7 @@
   )
 
 ;; definition for function ripple-find-height
-(defun ripple-find-height ((arg0 process-drawable) (arg1 basic) (arg2 vector))
+(defun ripple-find-height ((arg0 process-drawable) (arg1 int) (arg2 vector))
   (local-vars (sv-16 float) (sv-32 float))
   (let* ((f30-0 (-> arg0 root trans y))
          (v1-1 (-> arg0 draw))

goal_src/engine/gfx/water/water-h.gc

@@ -97,16 +97,67 @@
   :method-count-assert 30
   :size-assert         #xd4
   :flag-assert         #x1e007000d4
+  ;; inherited inspect of process-drawable
   (:methods
     (water-vol-idle () none 20) ;; state
     (water-vol-startup () none 21) ;; state
-    (dummy-22 () none 22)
+    (TODO-RENAME-22 (_type_) none 22)
     (dummy-23 () none 23)
     (dummy-24 () none 24)
-    (dummy-25 () none 25)
+    (TODO-RENAME-25 (_type_) quaternion 25)
     (dummy-26 () none 26)
     (dummy-27 () none 27)
-    (dummy-28 () none 28)
+    (get-ripple-height (_type_ vector) float 28)
     (dummy-29 () none 29)
     )
   )
+
+;; Manually Added
+(define-extern *water-anim-sunken-dark-eco-qbert-sg* skeleton-group)
+(define-extern *water-anim-sunken-dark-eco-platform-room-sg* skeleton-group)
+(define-extern *water-anim-sunken-dark-eco-helix-room-sg* skeleton-group)
+(define-extern *water-anim-sunken-big-room-sg* skeleton-group)
+(define-extern *water-anim-sunken-first-room-from-entrance-sg* skeleton-group)
+(define-extern *water-anim-sunken-qbert-room-sg* skeleton-group)
+(define-extern *water-anim-sunken-first-right-branch-sg* skeleton-group)
+(define-extern *water-anim-sunken-circular-with-bullys-sg* skeleton-group)
+(define-extern *water-anim-sunken-hall-with-one-whirlpool-sg* skeleton-group)
+(define-extern *water-anim-sunken-hall-with-three-whirlpools-sg* skeleton-group)
+(define-extern *water-anim-sunken-start-of-helix-slide-sg* skeleton-group)
+(define-extern *water-anim-sunken-room-above-exit-chamber-sg* skeleton-group)
+(define-extern *water-anim-sunken-hall-before-big-room-sg* skeleton-group)
+(define-extern *water-anim-sunken-short-piece-sg* skeleton-group)
+(define-extern *water-anim-sunken-big-room-upper-water-sg* skeleton-group)
+(define-extern *water-anim-maincave-center-pool-sg* skeleton-group)
+(define-extern *water-anim-maincave-lower-right-pool-sg* skeleton-group)
+(define-extern *water-anim-maincave-mid-right-pool-sg* skeleton-group)
+(define-extern *water-anim-maincave-lower-left-pool-sg* skeleton-group)
+(define-extern *water-anim-maincave-mid-left-pool-sg* skeleton-group)
+(define-extern *water-anim-maincave-water-with-crystal-sg* skeleton-group)
+(define-extern *water-anim-robocave-main-pool-sg* skeleton-group)
+(define-extern *water-anim-misty-mud-by-arena-sg* skeleton-group)
+(define-extern *water-anim-misty-mud-above-skeleton-sg* skeleton-group)
+(define-extern *water-anim-misty-mud-behind-skeleton-sg* skeleton-group)
+(define-extern *water-anim-misty-mud-above-skull-back-sg* skeleton-group)
+(define-extern *water-anim-misty-mud-above-skull-front-sg* skeleton-group)
+(define-extern *water-anim-misty-mud-other-near-skull-sg* skeleton-group)
+(define-extern *water-anim-misty-mud-near-skull-sg* skeleton-group)
+(define-extern *water-anim-misty-mud-under-spine-sg* skeleton-group)
+(define-extern *water-anim-misty-mud-by-dock-sg* skeleton-group)
+(define-extern *water-anim-misty-mud-island-near-dock-sg* skeleton-group)
+(define-extern *water-anim-misty-mud-lonely-island-sg* skeleton-group)
+(define-extern *water-anim-misty-dark-eco-pool-sg* skeleton-group)
+(define-extern *water-anim-ogre-lava-sg* skeleton-group)
+(define-extern *water-anim-jungle-river-sg* skeleton-group)
+(define-extern *water-anim-village3-lava-sg* skeleton-group)
+(define-extern *water-anim-training-lake-sg* skeleton-group)
+(define-extern *water-anim-darkcave-water-with-crystal-sg* skeleton-group)
+(define-extern *water-anim-rolling-water-back-sg* skeleton-group)
+(define-extern *water-anim-rolling-water-front-sg* skeleton-group)
+(define-extern *water-anim-finalboss-dark-eco-pool-sg* skeleton-group)
+(define-extern *water-anim-lavatube-energy-lava-sg* skeleton-group)
+(define-extern *water-anim-village1-rice-paddy-sg* skeleton-group)
+(define-extern *water-anim-village1-fountain-sg* skeleton-group)
+(define-extern *water-anim-village1-rice-paddy-mid-sg* skeleton-group)
+(define-extern *water-anim-village1-rice-paddy-top-sg* skeleton-group)
+(define-extern *water-anim-village2-bucket-sg* skeleton-group)

test/decompiler/reference/engine/gfx/ripple_REF.gc

@@ -183,7 +183,7 @@
   )
 
 ;; definition for function ripple-find-height
-(defun ripple-find-height ((arg0 process-drawable) (arg1 basic) (arg2 vector))
+(defun ripple-find-height ((arg0 process-drawable) (arg1 int) (arg2 vector))
   (local-vars (sv-16 float) (sv-32 float))
   (let* ((f30-0 (-> arg0 root trans y))
          (v1-1 (-> arg0 draw))

test/decompiler/reference/engine/gfx/water/water-h_REF.gc

@@ -151,13 +151,13 @@
   (:methods
     (water-vol-idle () none 20)
     (water-vol-startup () none 21)
-    (dummy-22 () none 22)
+    (TODO-RENAME-22 (_type_) none 22)
     (dummy-23 () none 23)
     (dummy-24 () none 24)
-    (dummy-25 () none 25)
+    (TODO-RENAME-25 (_type_) quaternion 25)
     (dummy-26 () none 26)
     (dummy-27 () none 27)
-    (dummy-28 () none 28)
+    (get-ripple-height (_type_ vector) float 28)
     (dummy-29 () none 29)
     )
   )

test/decompiler/reference/levels/common/rigid-body-h_REF.gc

@@ -27,20 +27,20 @@
   :size-assert         #x1a8
   :flag-assert         #x17000001a8
   (:methods
-    (dummy-9 () none 9)
-    (dummy-10 () none 10)
-    (dummy-11 () none 11)
-    (dummy-12 () none 12)
-    (dummy-13 () none 13)
-    (dummy-14 () none 14)
-    (dummy-15 () none 15)
-    (dummy-16 () none 16)
-    (dummy-17 () none 17)
-    (dummy-18 () none 18)
-    (dummy-19 () none 19)
-    (dummy-20 () none 20)
-    (dummy-21 () none 21)
-    (dummy-22 () none 22)
+    (TODO-RENAME-9 (_type_ float float float float) none 9)
+    (dummy-10 (_type_ float) none 10)
+    (clear-force-torque! (_type_) none 11)
+    (clear-momentum! (_type_) none 12)
+    (TODO-RENAME-13 (_type_ vector vector) none 13)
+    (TODO-RENAME-14 (_type_ vector vector) none 14)
+    (TODO-RENAME-15 (_type_ vector) none 15)
+    (TODO-RENAME-16 (_type_ vector vector float) none 16)
+    (TODO-RENAME-17 (_type_ vector vector) vector 17)
+    (TODO-RENAME-18 (_type_ vector) vector 18)
+    (dummy-19 (_type_) none 19)
+    (dummy-20 (_type_) none 20)
+    (TODO-RENAME-21 (_type_) none 21)
+    (TODO-RENAME-22 (_type_ vector quaternion float float) none 22)
     )
   )