decompiler: better automatic detection of art groups and joint-node-index macro detection (#3061)

test/decompiler/reference/jak1/decompiler-macros.gc

@@ -967,6 +967,23 @@
       )
   )
 
+(defmacro joint-name->index (jg-name name)
+  (let ((jg-info (hash-table-try-ref *jg-info* (symbol->string jg-name))))
+      (if (not (car jg-info))
+          -1
+          (let ((joint-node (hash-table-try-ref (cdr jg-info) (if (integer? name) (int->string name) (symbol->string name)))))
+              (if (not (car joint-node))
+                  -1
+                  (cadr (cdr joint-node)))
+              )
+          )
+      )
+  )
+
+(defmacro joint-node-index (jg name)
+  `(-> self node-list data (joint-name->index ,jg ,name))
+  )
+
 (defmacro defskelgroup (name art-name joint-geom joint-anim lods
                         &key (shadow 0)
                         &key bounds

test/decompiler/reference/jak1/engine/common-obs/collectables_REF.gc

@@ -1592,7 +1592,7 @@
   :code (behavior ()
     0.5
     (let ((f28-0 0.0))
-      (ja :group! (-> self draw art-group data 2))
+      (ja :group! fuel-cell-idle-ja)
       (loop
         (let ((f30-0 (vector-vector-distance (-> self base) (target-pos 0))))
           (set! f28-0
@@ -1761,7 +1761,7 @@
     (auto-save-command 'auto-save 0 0 *default-pool*)
     (ja-play-spooled-anim
       (-> self victory-anim)
-      (the-as art-joint-anim (-> self draw art-group data 2))
+      (the-as art-joint-anim fuel-cell-idle-ja)
       (the-as art-joint-anim #f)
       (the-as (function process-drawable symbol) false-func)
       )
@@ -2162,7 +2162,7 @@
        (set! (-> self root-override trans quad) (-> self draw origin quad))
        (set! (-> self base quad) (-> self root-override trans quad))
        (ja-channel-set! 1)
-       (ja :group! (-> self draw art-group data 2))
+       (ja :group! fuel-cell-idle-ja)
        (logclear! (-> self draw status) (draw-status hidden))
        (vector-reset! (-> self draw origin))
        (go-virtual wait)

test/decompiler/reference/jak1/engine/common-obs/orb-cache_REF.gc

@@ -93,7 +93,7 @@
         )
       )
     (process-entity-status! self (entity-perm-status complete) #f)
-    (ja :group! (-> self draw art-group data 3) :num! (identity (ja-aframe 0.0 0)))
+    (ja :group! orb-cache-top-idle-ja :num! (identity (ja-aframe 0.0 0)))
     (transform-post)
     (anim-loop)
     )
@@ -288,7 +288,7 @@
     (if (not arg0)
         (sound-play "close-orb-cash")
         )
-    (ja :group! (-> self draw art-group data 3) :num! (identity (ja-aframe 0.0 0)))
+    (ja :group! orb-cache-top-idle-ja :num! (identity (ja-aframe 0.0 0)))
     (new 'stack-no-clear 'vector)
     (set! (-> self basetrans y) (+ 2048.0 (-> self root-pos)))
     (anim-loop)

test/decompiler/reference/jak1/engine/game/powerups_REF.gc

@@ -548,7 +548,7 @@
                (not (time-elapsed? (-> self control unknown-dword11) (seconds 0.05)))
                )
           )
-     (let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 74))))
+     (let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg RbigToe))))
        (if (and (< (fabs (vector-dot
                            (-> self control dynam gravity-normal)
                            (vector-! (new 'stack-no-clear 'vector) gp-0 (-> self control trans))
@@ -561,7 +561,7 @@
            (launch-particles :system *sp-particle-system-3d* (-> *part-id-table* 2391) gp-0)
            )
        )
-     (let ((gp-1 (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 70))))
+     (let ((gp-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg LbigToe))))
        (if (and (< (fabs (vector-dot
                            (-> self control dynam gravity-normal)
                            (vector-! (new 'stack-no-clear 'vector) gp-1 (-> self control trans))

test/decompiler/reference/jak1/engine/target/logic-target_REF.gc

@@ -1442,7 +1442,7 @@
       ((and (= (-> self next-state name) 'target-clone-anim)
             (not (logtest? (-> self draw status) (draw-status hidden)))
             (begin
-              (vector<-cspace! gp-0 (-> self node-list data 3))
+              (vector<-cspace! gp-0 (joint-node-index eichar-lod0-jg main))
               (+! (-> gp-0 y) -5896.192)
               (< (fabs (- (-> gp-0 y) (-> self control trans y))) 8192.0)
               )
@@ -2069,10 +2069,10 @@
   (set! (-> self draw lod-set max-lod) 0)
   (logior! (-> self skel status) (janim-status inited eye))
   (set! (-> self draw shadow-ctrl) *target-shadow-control*)
-  (set! (-> self control unknown-cspace00 parent) (-> self node-list data 42))
-  (set! (-> self control unknown-cspace00 joint) (the-as joint (-> self node-list data 54)))
-  (set! (-> self control unknown-cspace00 joint) (the-as joint (-> self node-list data 54)))
-  (set! (-> self control unknown-cspace10 parent) (-> self node-list data 64))
+  (set! (-> self control unknown-cspace00 parent) (joint-node-index eichar-lod0-jg lindA))
+  (set! (-> self control unknown-cspace00 joint) (the-as joint (joint-node-index eichar-lod0-jg rindA)))
+  (set! (-> self control unknown-cspace00 joint) (the-as joint (joint-node-index eichar-lod0-jg rindA)))
+  (set! (-> self control unknown-cspace10 parent) (joint-node-index eichar-lod0-jg LshoulderPad))
   (set! (-> self neck) (new 'process 'joint-mod (joint-mod-handler-mode look-at) self 7))
   (set! (-> self fact-info-target)
         (new 'process 'fact-info-target self (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc))

test/decompiler/reference/jak1/engine/target/target-util_REF.gc

@@ -859,9 +859,9 @@
              (time-elapsed? (-> self control unknown-dword11) (-> *TARGET-bank* ground-timeout))
              (>= 0.0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))
              (let ((v1-15 (ja-group)))
-               (or (not (or (= v1-15 (-> self draw art-group data 59))
-                            (= v1-15 (-> self draw art-group data 60))
-                            (= v1-15 (-> self draw art-group data 61))
+               (or (not (or (= v1-15 eichar-attack-punch-ja)
+                            (= v1-15 eichar-attack-punch-end-ja)
+                            (= v1-15 eichar-attack-punch-alt-end-ja)
                             )
                         )
                    (< 4096.0 (target-height-above-ground))

test/decompiler/reference/jak1/engine/target/target2_REF.gc

@@ -1404,7 +1404,7 @@
                              gp-1
                              projectile-init-by-other
                              (-> self entity)
-                             (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 23))
+                             (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg sk_rhand))
                              s5-2
                              (if (>= (-> self fact-info-target eco-level) (-> *FACT-bank* eco-level-max))
                                  25
@@ -1884,7 +1884,7 @@
              (create-splash
                (-> self water)
                (the-as float 0.2)
-               (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 75))
+               (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg Rtoes))
                0
                (vector-float*! (new 'stack-no-clear 'vector) (-> self control transv) 2.5)
                )
@@ -1894,7 +1894,7 @@
              (create-splash
                (-> self water)
                (the-as float 0.2)
-               (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 71))
+               (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg Ltoes))
                0
                (vector-float*! (new 'stack-no-clear 'vector) (-> self control transv) 2.5)
                )
@@ -2768,7 +2768,7 @@
   :exit (behavior ()
     (send-event (ppointer->process (-> self sidekick)) 'matrix 'normal)
     (send-event (ppointer->process (-> self sidekick)) 'shadow #t)
-    (let ((gp-0 (-> self node-list data 3))
+    (let ((gp-0 (joint-node-index eichar-lod0-jg main))
           (a1-2 (&-> (-> self control) unknown-qword00))
           )
       (cond

test/decompiler/reference/jak1/engine/target/target_REF.gc

@@ -2098,7 +2098,7 @@
           (create-splash
             (-> self water)
             (the-as float 0.6)
-            (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 37))
+            (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg mouth))
             0
             (-> self control transv)
             )

test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc

@@ -44,7 +44,7 @@
     )
   :trans (behavior ()
     (rider-trans)
-    (let ((t2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 4))))
+    (let ((t2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index windmill-one-lod0-jg big))))
       (if (!= (+ (-> t2-0 x) (-> t2-0 y) (-> t2-0 z)) 0.0)
           (sound-play "gears-rumble" :id (-> self sound-id) :position (the-as symbol t2-0))
           )
@@ -52,7 +52,7 @@
     )
   :code (behavior ()
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek! max 0.5) :frame-num 0.0)
+      (ja-no-eval :group! windmill-one-idle-ja :num! (seek! max 0.5) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! max 0.5))
@@ -275,7 +275,7 @@
     )
   :code (behavior ()
     (set-time! (-> self state-time))
-    (ja :group! (-> self draw art-group data 3) :num! min)
+    (ja :group! grottopole-idle-ja :num! min)
     (transform-post)
     (suspend)
     (loop
@@ -1332,13 +1332,13 @@
     (suspend)
     (update-transforms! (-> self root-override))
     (when (not arg0)
-      (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! flutflutegg-crack-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
         )
       )
-    (ja :group! (-> self draw art-group data 5) :num! max)
+    (ja :group! flutflutegg-crack-ja :num! max)
     (while (and (not (task-closed? (game-task beach-flutflut) (task-status need-reward-speech)))
                 (not (logtest? (-> self ambients-played) 1024))
                 )
@@ -1368,7 +1368,7 @@
     (ja-channel-set! 1)
     (set-vector! (-> self root-override trans) -231190.94 64559.105 -1164727.5 1.0)
     (quaternion-axis-angle! (-> self root-override quat) 0.0 1.0 0.0 0.0)
-    (ja :group! (-> self draw art-group data 6) :num! max)
+    (ja :group! flutflutegg-broke-ja :num! max)
     (loop
       (logior! (-> self mask) (process-mask sleep))
       (suspend)
@@ -1479,7 +1479,7 @@
     (if (and (-> self alt-actor) (logtest? (-> self alt-actor extra perm status) (entity-perm-status complete)))
         (go harvester-inflate #t)
         )
-    (ja :group! (-> self draw art-group data 5) :num! (identity (ja-aframe 1.0 0)))
+    (ja :group! harvester-inflate-ja :num! (identity (ja-aframe 1.0 0)))
     (ja-post)
     (loop
       (logior! (-> self mask) (process-mask sleep))
@@ -1492,14 +1492,14 @@
 (defstate harvester-inflate (harvester)
   :code (behavior ((arg0 symbol))
     (when (not arg0)
-      (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! harvester-inflate-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
         )
       )
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! harvester-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))

test/decompiler/reference/jak1/levels/beach/beach-rocks_REF.gc

@@ -344,19 +344,34 @@
           )
         )
       (if (and (< 200.0 f30-0) (< f30-0 275.0))
-          (spawn (-> self part-falling) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 3)))
+          (spawn
+            (-> self part-falling)
+            (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index lrocklrg-lod0-jg Lrocklrg))
+            )
           )
       (if (and (< 270.0 f30-0) (< f30-0 333.0))
-          (spawn (-> self part-falling) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 4)))
+          (spawn
+            (-> self part-falling)
+            (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index lrocklrg-lod0-jg platformrock))
+            )
           )
       (if (and (< (-> self prev-frame) 333.0) (>= f30-0 333.0))
-          (spawn (-> self part-landing) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 4)))
+          (spawn
+            (-> self part-landing)
+            (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index lrocklrg-lod0-jg platformrock))
+            )
           )
       (if (and (< 169.0 f30-0) (< f30-0 202.0))
-          (spawn (-> self part-falling) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 5)))
+          (spawn
+            (-> self part-falling)
+            (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index lrocklrg-lod0-jg Rrocklrg))
+            )
           )
       (if (and (< 240.0 f30-0) (< f30-0 270.0))
-          (spawn (-> self part-falling) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 6)))
+          (spawn
+            (-> self part-falling)
+            (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index lrocklrg-lod0-jg smlrock))
+            )
           )
       (set! (-> self prev-frame) f30-0)
       )
@@ -370,7 +385,7 @@
       )
     (logclear! (-> self draw status) (draw-status hidden))
     (ja-channel-set! 1)
-    (ja :group! (-> self draw art-group data 2) :num! min)
+    (ja :group! lrocklrg-idle-ja :num! min)
     (let ((gp-2 (ppointer->handle (process-spawn othercam self 7 #f #t :to self)))
           (s5-1 (ppointer->handle (process-spawn
                                     fuel-cell
@@ -392,8 +407,8 @@
           :parts 4
           :command-list '((-150 blackout 100) (-116 blackout 0))
           )
-        (the-as art-joint-anim (-> self draw art-group data 2))
-        (the-as art-joint-anim (-> self draw art-group data 3))
+        (the-as art-joint-anim lrocklrg-idle-ja)
+        (the-as art-joint-anim lrocklrg-fallen-ja)
         (the-as (function process-drawable symbol) false-func)
         )
       (process-entity-status! self (entity-perm-status complete) #t)
@@ -431,7 +446,7 @@
       *entity-pool*
       (game-task none)
       )
-    (ja :group! (-> self draw art-group data 3))
+    (ja :group! lrocklrg-fallen-ja)
     (compute-alignment! (-> self align))
     (let ((v1-6 (first-transform (-> self align))))
       (set! (-> self root-override trans quad) (-> self entity extra trans quad))

test/decompiler/reference/jak1/levels/citadel/assistant-citadel_REF.gc

@@ -102,7 +102,7 @@
     (loop
       (when (!= (ja-group) (get-art-elem self))
         (ja-channel-push! 1 (seconds 0.05))
-        (ja :group! (-> self draw art-group data 3))
+        (ja :group! assistant-lavatube-end-idle-ja)
         )
       (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)

test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc

@@ -1165,7 +1165,7 @@
   :code (behavior ()
     (process-entity-status! self (entity-perm-status complete) #t)
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! citb-coil-die-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -1178,7 +1178,7 @@
 ;; failed to figure out what this is:
 (defstate citb-coil-broken (citb-coil)
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! citb-coil-dead-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -1256,7 +1256,7 @@
   :event citb-hose-event-handler
   :code (behavior ()
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! citb-hose-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
@@ -1271,7 +1271,7 @@
   :event citb-hose-event-handler
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! citb-hose-spit-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -1287,7 +1287,7 @@
   :code (behavior ()
     (process-entity-status! self (entity-perm-status complete) #t)
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! citb-hose-die-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))

test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc

@@ -111,7 +111,7 @@
       (('stop-cloning)
        (set! (-> self cloning) #f)
        (let ((v1-7 (-> self skel root-channel 0)))
-         (set! v0-3 (-> self draw art-group data 3))
+         (set! v0-3 citb-sagecage-idle-ja)
          (set! (-> v1-7 frame-group) (the-as art-joint-anim v0-3))
          )
        v0-3

test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc

@@ -1027,7 +1027,7 @@
       )
     )
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! citb-firehose-start-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -1036,7 +1036,7 @@
     (restore-collide-with-as (-> self root-override))
     (sound-play "eco-torch" :position (the-as symbol (-> self blast-pos)))
     (dotimes (gp-1 2)
-      (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! citb-firehose-loopflame-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (set! (-> self blast-pos quad) (-> self node-list data 5 bone transform vector 3 quad))
         (citb-firehose-blast-particles)
@@ -1046,7 +1046,7 @@
       )
     (clear-collide-with-as (-> self root-override))
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! citb-firehose-end-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))

test/decompiler/reference/jak1/levels/finalboss/final-door_REF.gc

@@ -400,13 +400,13 @@
     (rot->dir-targ! (-> self control))
     (transform-post)
     (ja-channel-push! 1 (seconds 0.2))
-    (ja-no-eval :group! (-> self draw art-group data 88) :num! (seek! (ja-aframe 18.0 0)) :frame-num 0.0)
+    (ja-no-eval :group! eichar-shocked-ja :num! (seek! (ja-aframe 18.0 0)) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek! (ja-aframe 18.0 0)))
       )
     (let ((s4-3 (-> (handle->process (the-as handle arg0)) entity))
-          (s3-1 (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 7)))
+          (s3-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg neckB)))
           )
       (dotimes (s2-0 50)
         (when (handle->process (the-as handle arg0))

test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc

@@ -481,7 +481,7 @@
 ;; INFO: Return type mismatch int vs none.
 (defbehavior robotboss-manipy-trans-hook robotboss ()
   (let ((gp-0 (new 'stack-no-clear 'vector)))
-    (vector<-cspace! gp-0 (-> self node-list data 7))
+    (vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg blue_eco_piece))
     (spawn (-> self part) gp-0)
     )
   0

test/decompiler/reference/jak1/levels/finalboss/robotboss-weapon_REF.gc

@@ -395,22 +395,22 @@
     (if (>= (- (-> *display* game-frame-counter) (-> self state-time)) (the int (-> self countdown-time)))
         (go darkecobomb-explode #f)
         )
-    (when (ja-group? (-> self draw art-group data 5))
+    (when (ja-group? darkecobomb-spin-cycle-ja)
       (let ((gp-2 (new 'stack-no-clear 'vector)))
-        (vector<-cspace! gp-2 (-> self node-list data 5))
+        (vector<-cspace! gp-2 (joint-node-index darkecobomb-lod0-jg particles))
         (spawn (-> self part) gp-2)
         )
       )
     )
   :code (behavior ()
     (sound-play "bomb-open")
-    (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! darkecobomb-open-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
       )
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek! max (-> self anim-speed)) :frame-num 0.0)
+      (ja-no-eval :group! darkecobomb-spin-cycle-ja :num! (seek! max (-> self anim-speed)) :frame-num 0.0)
       (until (ja-done? 0)
         (update! (-> self sound))
         (suspend)
@@ -441,7 +441,7 @@
       (ja-eval)
       )
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! darkecobomb-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
@@ -466,13 +466,13 @@
         )
     )
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! darkecobomb-blast-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
       )
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! darkecobomb-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))

test/decompiler/reference/jak1/levels/finalboss/robotboss_REF.gc

@@ -60,7 +60,7 @@
               (gp-1 (-> self node-list data 88 bone scale))
               )
           (let ((s4-1 (new 'stack-no-clear 'vector)))
-            (vector<-cspace! s4-1 (-> self node-list data 88))
+            (vector<-cspace! s4-1 (joint-node-index robotboss-basic-lod0-jg camera))
             (set! (-> *camera-other-trans* quad) (-> s4-1 quad))
             )
           (vector-normalize-copy!
@@ -93,21 +93,21 @@
 (defbehavior robotboss-always-trans robotboss ((arg0 (state robotboss)))
   (when (-> self blue-smoke)
     (let ((s5-0 (new 'stack-no-clear 'vector)))
-      (vector<-cspace! s5-0 (-> self node-list data 7))
+      (vector<-cspace! s5-0 (joint-node-index robotboss-basic-lod0-jg blue_eco_piece))
       (spawn (-> self particle 2) s5-0)
       )
     )
   (when (-> self red-smoke)
     (let ((s5-1 (new 'stack-no-clear 'vector)))
-      (vector<-cspace! s5-1 (-> self node-list data 47))
+      (vector<-cspace! s5-1 (joint-node-index robotboss-basic-lod0-jg rArmTopWireC))
       (spawn (-> self particle 3) s5-1)
-      (vector<-cspace! s5-1 (-> self node-list data 51))
+      (vector<-cspace! s5-1 (joint-node-index robotboss-basic-lod0-jg rArmBotWireC))
       (spawn (-> self particle 3) s5-1)
       )
     )
   (when (-> self yellow-smoke)
     (let ((s5-2 (new 'stack-no-clear 'vector)))
-      (vector<-cspace! s5-2 (-> self node-list data 27))
+      (vector<-cspace! s5-2 (joint-node-index robotboss-basic-lod0-jg Lyellow_ecoTubeA))
       (spawn (-> self particle 4) s5-2)
       )
     )
@@ -211,7 +211,7 @@
      )
     ((-> self use-interesting)
      (let ((s5-10 (new 'stack-no-clear 'vector)))
-       (vector<-cspace! s5-10 (-> self node-list data 87))
+       (vector<-cspace! s5-10 (joint-node-index robotboss-basic-lod0-jg interesting))
        (send-event *camera* 'point-of-interest s5-10)
        )
      )
@@ -341,7 +341,7 @@
   (+! (-> self children-spawned) 1)
   (let ((gp-0 (new 'stack-no-clear 'vector)))
     (let ((s4-0 (new 'stack-no-clear 'vector)))
-      (vector<-cspace! gp-0 (-> self node-list data 60))
+      (vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg darkbombD))
       (set! (-> s4-0 quad) (-> self entity extra trans quad))
       (vector+! s4-0 s4-0 arg0)
       (process-spawn darkecobomb gp-0 s4-0 61440.0 300 arg1 :to self)
@@ -859,7 +859,7 @@
   (+! (-> self children-spawned) 1)
   (let ((gp-0 (new 'stack-no-clear 'vector)))
     (let ((s5-0 (new 'stack-no-clear 'vector)))
-      (vector<-cspace! gp-0 (-> self node-list data 21))
+      (vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg Lyellow_ecoBarrell))
       (set! (-> gp-0 y) 1972633.6)
       (if *target*
           (set! (-> s5-0 quad) (-> (target-pos 0) quad))
@@ -1007,7 +1007,7 @@
        (ja :group! robotboss-yellow-last-hit-ja)
        (set! (-> self yellow-smoke) #t)
        (let ((gp-0 (new 'stack-no-clear 'vector)))
-         (vector<-cspace! gp-0 (-> self node-list data 27))
+         (vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg Lyellow_ecoTubeA))
          (process-spawn
            part-tracker
            :init part-tracker-init
@@ -1043,7 +1043,7 @@
                )
       (let ((gp-2 (new 'stack-no-clear 'vector)))
         (update! (-> self looping-sound 3))
-        (vector<-cspace! gp-2 (-> self node-list data 21))
+        (vector<-cspace! gp-2 (joint-node-index robotboss-basic-lod0-jg Lyellow_ecoBarrell))
         (spawn (-> self particle 6) gp-2)
         )
       )
@@ -1421,7 +1421,7 @@
   (let ((s5-0 arg1))
     (+! (-> self children-spawned) 1)
     (let ((gp-0 (new 'stack-no-clear 'vector)))
-      (vector<-cspace! gp-0 (-> self node-list data 40))
+      (vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg red_ecoTip))
       (let ((s4-0 (get-process *default-dead-pool* redshot #x4000)))
         (when s4-0
           (let ((t9-2 (method-of-type redshot activate)))
@@ -1616,7 +1616,7 @@
        (ja :group! robotboss-red-last-hit-ja)
        (set! (-> self red-smoke) #t)
        (let ((gp-0 (new 'stack-no-clear 'vector)))
-         (vector<-cspace! gp-0 (-> self node-list data 51))
+         (vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg rArmBotWireC))
          (process-spawn
            part-tracker
            :init part-tracker-init
@@ -1683,7 +1683,7 @@
         (until (ja-done? 0)
           (update! (-> self looping-sound 2))
           (let ((gp-0 (new 'stack-no-clear 'vector)))
-            (vector<-cspace! gp-0 (-> self node-list data 40))
+            (vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg red_ecoTip))
             (spawn (-> self particle 5) gp-0)
             )
           (if (robotboss-is-red-hit)
@@ -1903,7 +1903,7 @@
   (+! (-> self children-spawned) 1)
   (let ((gp-0 (new 'stack-no-clear 'vector)))
     (let ((s2-0 (new 'stack-no-clear 'vector)))
-      (vector<-cspace! gp-0 (-> self node-list data 68))
+      (vector<-cspace! gp-0 (joint-node-index robotboss-basic-lod0-jg green_eco))
       (set! (-> s2-0 quad) (-> self entity extra trans quad))
       (+! (-> s2-0 y) -40960.0)
       (vector+! s2-0 s2-0 arg0)
@@ -2578,7 +2578,7 @@
        (sound-play "explod-eye")
        (set! (-> self blue-smoke) #t)
        (let ((gp-1 (new 'stack-no-clear 'vector)))
-         (vector<-cspace! gp-1 (-> self node-list data 7))
+         (vector<-cspace! gp-1 (joint-node-index robotboss-basic-lod0-jg blue_eco_piece))
          (process-spawn
            part-tracker
            :init part-tracker-init

test/decompiler/reference/jak1/levels/flut_common/flutflut_REF.gc

@@ -194,7 +194,7 @@
   :exit (-> (method-of-type flutflut wait-for-start) exit)
   :code (behavior ()
     (ja-channel-set! 1)
-    (ja :group! (-> self draw art-group data 3))
+    (ja :group! flut-saddle-flut-idle-ja)
     (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused))
     (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible))
     (loop
@@ -248,7 +248,7 @@
     (case message
       (('draw)
        (ja-channel-set! 1)
-       (ja :group! (-> self draw art-group data 3))
+       (ja :group! flut-saddle-flut-idle-ja)
        (set! (-> self root-override root-prim prim-core action) (collide-action solid attackable-unused))
        (set! (-> self root-override root-prim prim-core offense) (collide-offense indestructible))
        (transform-post)

test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc

@@ -231,27 +231,23 @@
 ;; INFO: Return type mismatch int vs none.
 (defbehavior target-flut-falling-anim-trans target ()
   (let ((v1-2 (ja-group)))
-    (b!
-      (or (= v1-2 (-> self draw art-group data 144)) (= v1-2 (-> self draw art-group data 145)))
-      cfg-7
-      :delay (empty-form)
-      )
+    (b! (or (= v1-2 eichar-flut-jump-loop-ja) (= v1-2 eichar-flut-jump-land-ja)) cfg-7 :delay (empty-form))
     )
   (ja-channel-push! 1 (seconds 0.33))
-  (ja :group! (-> self draw art-group data 144))
+  (ja :group! eichar-flut-jump-loop-ja)
   (b! #t cfg-23 :delay (nop!))
   (label cfg-7)
   (cond
     ((and (logtest? (-> self control status) (cshape-moving-flags onsurf))
-          (not (ja-group? (-> self draw art-group data 145)))
+          (not (ja-group? eichar-flut-jump-land-ja))
           )
      (ja-channel-push! 1 (seconds 0.02))
-     (ja :group! (-> self draw art-group data 145))
+     (ja :group! eichar-flut-jump-land-ja)
      )
-    ((ja-group? (-> self draw art-group data 144))
+    ((ja-group? eichar-flut-jump-loop-ja)
      (ja :num! (loop!))
      )
-    ((ja-group? (-> self draw art-group data 145))
+    ((ja-group? eichar-flut-jump-land-ja)
      (ja :num! (seek!))
      )
     )
@@ -263,13 +259,13 @@
 ;; definition for function target-flut-hit-ground-anim
 (defbehavior target-flut-hit-ground-anim target ()
   (cond
-    ((ja-group? (-> self draw art-group data 144))
+    ((ja-group? eichar-flut-jump-loop-ja)
      (if (!= (-> self skel root-channel 0) (-> self skel channel))
          (ja-channel-push! 2 (seconds 0.05))
          (ja-channel-set! 2)
          )
-     (ja :group! (-> self draw art-group data 145) :num! min)
-     (ja :chan 1 :group! (-> self draw art-group data 148) :num! min)
+     (ja :group! eichar-flut-jump-land-ja :num! min)
+     (ja :chan 1 :group! eichar-flut-jump-forward-land-ja :num! min)
      (until (ja-done? 0)
        (suspend)
        (ja :num! (seek!))
@@ -278,13 +274,13 @@
      #f
      )
     ((let ((v1-33 (ja-group)))
-       (or (= v1-33 (-> self draw art-group data 143)) (= v1-33 (-> self draw art-group data 145)))
+       (or (= v1-33 eichar-flut-jump-ja) (= v1-33 eichar-flut-jump-land-ja))
        )
      #f
      )
-    ((ja-group? (-> self draw art-group data 149))
+    ((ja-group? eichar-flut-double-jump-ja)
      (ja-channel-set! 1)
-     (ja-no-eval :group! (-> self draw art-group data 145) :num! (seek!) :frame-num 0.0)
+     (ja-no-eval :group! eichar-flut-jump-land-ja :num! (seek!) :frame-num 0.0)
      (until (ja-done? 0)
        (suspend)
        (ja :num! (seek!))
@@ -292,10 +288,10 @@
      #f
      )
     ((let ((v1-68 (ja-group)))
-       (or (= v1-68 (-> self draw art-group data 152)) (= v1-68 (-> self draw art-group data 153)))
+       (or (= v1-68 eichar-flut-air-attack-ja) (= v1-68 eichar-flut-air-attack-loop-ja))
        )
      (ja-channel-set! 1)
-     (ja-no-eval :group! (-> self draw art-group data 154) :num! (seek!) :frame-num 0.0)
+     (ja-no-eval :group! eichar-flut-air-attack-land-ja :num! (seek!) :frame-num 0.0)
      (until (ja-done? 0)
        (compute-alignment! (-> self align))
        (align! (-> self align) (align-opts adjust-xz-vel) (the-as float 1.0) (the-as float 1.0) (the-as float 1.0))
@@ -568,9 +564,9 @@
              (and (time-elapsed? (-> self control unknown-dword11) (-> *FLUT-bank* ground-timeout))
                   (>= 0.0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))
                   (let ((v1-37 (ja-group)))
-                    (or (not (or (= v1-37 (-> self draw art-group data 59))
-                                 (= v1-37 (-> self draw art-group data 60))
-                                 (= v1-37 (-> self draw art-group data 61))
+                    (or (not (or (= v1-37 eichar-attack-punch-ja)
+                                 (= v1-37 eichar-attack-punch-end-ja)
+                                 (= v1-37 eichar-attack-punch-alt-end-ja)
                                  )
                              )
                         (< 4096.0 (target-height-above-ground))
@@ -585,25 +581,25 @@
     (let ((gp-0 22))
       (let ((v1-2 (ja-group)))
         (cond
-          ((or (= v1-2 (-> self draw art-group data 141)) (= v1-2 (-> self draw art-group data 161)))
+          ((or (= v1-2 eichar-flut-walk-ja) (= v1-2 eichar-flut-squash-run-ja))
            (set! gp-0 60)
            )
-          ((ja-group? (-> self draw art-group data 155))
+          ((ja-group? eichar-flut-get-on-ja)
            (ja-no-eval :num! (seek!))
            (while (not (ja-done? 0))
              (suspend)
              (ja-eval)
              )
            )
-          ((ja-group? (-> self draw art-group data 158))
-           (ja-no-eval :group! (-> self draw art-group data 159) :num! (seek!) :frame-num 0.0)
+          ((ja-group? eichar-flut-smack-surface-ja)
+           (ja-no-eval :group! eichar-flut-smack-surface-end-ja :num! (seek!) :frame-num 0.0)
            (until (ja-done? 0)
              (suspend)
              (ja :num! (seek!))
              )
            )
-          ((ja-group? (-> self draw art-group data 150))
-           (ja-no-eval :group! (-> self draw art-group data 151) :num! (seek!) :frame-num 0.0)
+          ((ja-group? eichar-flut-running-attack-ja)
+           (ja-no-eval :group! eichar-flut-running-attack-end-ja :num! (seek!) :frame-num 0.0)
            (until (ja-done? 0)
              (suspend)
              (ja :num! (seek!))
@@ -611,11 +607,11 @@
            )
           )
         )
-      (if (not (ja-group? (-> self draw art-group data 140)))
+      (if (not (ja-group? eichar-flut-idle-ja))
           (ja-channel-push! 1 (the-as time-frame gp-0))
           )
       )
-    (ja :group! (-> self draw art-group data 140))
+    (ja :group! eichar-flut-idle-ja)
     (loop
       (suspend)
       (ja :num! (loop!))
@@ -660,9 +656,9 @@
              (and (time-elapsed? (-> self control unknown-dword11) (-> *FLUT-bank* ground-timeout))
                   (>= 0.0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))
                   (let ((v1-37 (ja-group)))
-                    (or (not (or (= v1-37 (-> self draw art-group data 59))
-                                 (= v1-37 (-> self draw art-group data 60))
-                                 (= v1-37 (-> self draw art-group data 61))
+                    (or (not (or (= v1-37 eichar-attack-punch-ja)
+                                 (= v1-37 eichar-attack-punch-end-ja)
+                                 (= v1-37 eichar-attack-punch-alt-end-ja)
                                  )
                              )
                         (< 4096.0 (target-height-above-ground))
@@ -701,18 +697,18 @@
           )
       (let ((gp-0 22))
         (cond
-          ((ja-group? (-> self draw art-group data 140))
+          ((ja-group? eichar-flut-idle-ja)
            (set! gp-0 60)
            )
           ((let ((v1-9 (ja-group)))
-             (or (= v1-9 (-> self draw art-group data 143))
-                 (= v1-9 (-> self draw art-group data 144))
-                 (= v1-9 (-> self draw art-group data 152))
-                 (= v1-9 (-> self draw art-group data 154))
+             (or (= v1-9 eichar-flut-jump-ja)
+                 (= v1-9 eichar-flut-jump-loop-ja)
+                 (= v1-9 eichar-flut-air-attack-ja)
+                 (= v1-9 eichar-flut-air-attack-land-ja)
                  )
              )
            (ja-channel-push! 1 (seconds 0.08))
-           (ja-no-eval :group! (-> self draw art-group data 161) :num! (seek!) :frame-num 0.0)
+           (ja-no-eval :group! eichar-flut-squash-run-ja :num! (seek!) :frame-num 0.0)
            (until (ja-done? 0)
              (suspend)
              (ja :num! (seek!))
@@ -720,11 +716,11 @@
            )
           )
         (set! f30-0 (cond
-                      ((ja-group? (-> self draw art-group data 161))
+                      ((ja-group? eichar-flut-squash-run-ja)
                        (ja-channel-set! 2)
                        1.0
                        )
-                      ((ja-group? (-> self draw art-group data 141))
+                      ((ja-group? eichar-flut-walk-ja)
                        (set! f28-0 (ja-frame-num 0))
                        (-> self skel root-channel 1 frame-interp)
                        )
@@ -735,9 +731,9 @@
                       )
               )
         )
-      (ja-no-eval :group! (-> self draw art-group data 141) :num! (loop!) :dist 49152.0 :frame-num f28-0)
+      (ja-no-eval :group! eichar-flut-walk-ja :num! (loop!) :dist 49152.0 :frame-num f28-0)
       (ja-no-eval :chan 1
-                  :group! (-> self draw art-group data 142)
+                  :group! eichar-flut-run-ja
                   :num! (identity (* 0.5 f28-0))
                   :frame-interp f30-0
                   :dist 40960.0
@@ -884,16 +880,16 @@
     )
   :code (behavior ((arg0 float) (arg1 float))
     (ja-channel-push! 2 (seconds 0.12))
-    (ja :group! (-> self draw art-group data 143) :num! min)
+    (ja :group! eichar-flut-jump-ja :num! min)
     (ja :chan 1
-        :group! (-> self draw art-group data 146)
+        :group! eichar-flut-jump-forward-ja
         :num! (chan 0)
         :frame-interp (-> self control unknown-float122)
         )
     (suspend)
-    (ja :group! (-> self draw art-group data 143) :num! (+!))
+    (ja :group! eichar-flut-jump-ja :num! (+!))
     (ja :chan 1
-        :group! (-> self draw art-group data 146)
+        :group! eichar-flut-jump-forward-ja
         :num! (chan 0)
         :frame-interp (-> self control unknown-float122)
         )
@@ -920,17 +916,17 @@
       (ja :chan 1 :num! (chan 0) :frame-interp (-> self control unknown-float122))
       (suspend)
       )
-    (ja-no-eval :group! (-> self draw art-group data 144) :num! (loop!) :frame-num 0.0)
+    (ja-no-eval :group! eichar-flut-jump-loop-ja :num! (loop!) :frame-num 0.0)
     (ja :chan 1
-        :group! (-> self draw art-group data 147)
+        :group! eichar-flut-jump-forward-loop-ja
         :num! (chan 0)
         :frame-interp (-> self control unknown-float122)
         )
     (loop
       (suspend)
-      (ja :group! (-> self draw art-group data 144) :num! (loop!))
+      (ja :group! eichar-flut-jump-loop-ja :num! (loop!))
       (ja :chan 1
-          :group! (-> self draw art-group data 147)
+          :group! eichar-flut-jump-forward-loop-ja
           :num! (chan 0)
           :frame-interp (-> self control unknown-float122)
           )
@@ -979,7 +975,7 @@
     (if (!= (-> self state-time) (current-time))
         (mod-var-jump #t #t (cpad-hold? (-> self control unknown-cpad-info00 number) x) (-> self control transv))
         )
-    (if (ja-group? (-> self draw art-group data 149))
+    (if (ja-group? eichar-flut-double-jump-ja)
         (sound-play "flut-flap" :id (-> self flut flap-sound-id))
         )
     (seek!
@@ -990,7 +986,7 @@
     )
   :code (behavior ((arg0 float) (arg1 float))
     (ja-channel-push! 1 (seconds 0.05))
-    (ja-no-eval :group! (-> self draw art-group data 149) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! eichar-flut-double-jump-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (cpad-set-buzz! (-> *cpad-list* cpads 0) 0 3 (seconds 0.1))
       (suspend)
@@ -998,10 +994,7 @@
       )
     (set! (-> self control unknown-surface00) *flut-jump-mods*)
     (dotimes (gp-0 1)
-      (ja-no-eval :group! (-> self draw art-group data 149)
-                  :num! (seek!)
-                  :frame-num (ja-aframe (the-as float 14.0) 0)
-                  )
+      (ja-no-eval :group! eichar-flut-double-jump-ja :num! (seek!) :frame-num (ja-aframe (the-as float 14.0) 0))
       (until (ja-done? 0)
         (cpad-set-buzz! (-> *cpad-list* cpads 0) 0 3 (seconds 0.1))
         (suspend)
@@ -1028,9 +1021,9 @@
       )
     (current-time)
     (ja-channel-push! 2 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 144) :num! (loop!) :frame-num 0.0)
+    (ja-no-eval :group! eichar-flut-jump-loop-ja :num! (loop!) :frame-num 0.0)
     (ja :chan 1
-        :group! (-> self draw art-group data 147)
+        :group! eichar-flut-jump-forward-loop-ja
         :num! min
         :frame-interp (-> self control unknown-float122)
         )
@@ -1085,9 +1078,9 @@
              (and (time-elapsed? (-> self control unknown-dword11) (-> *FLUT-bank* ground-timeout))
                   (>= 0.0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))
                   (let ((v1-34 (ja-group)))
-                    (or (not (or (= v1-34 (-> self draw art-group data 59))
-                                 (= v1-34 (-> self draw art-group data 60))
-                                 (= v1-34 (-> self draw art-group data 61))
+                    (or (not (or (= v1-34 eichar-attack-punch-ja)
+                                 (= v1-34 eichar-attack-punch-end-ja)
+                                 (= v1-34 eichar-attack-punch-alt-end-ja)
                                  )
                              )
                         (< 4096.0 (target-height-above-ground))
@@ -1136,18 +1129,18 @@
     )
   :code (behavior ((arg0 symbol))
     (cond
-      ((ja-group? (-> self draw art-group data 144))
+      ((ja-group? eichar-flut-jump-loop-ja)
        )
-      ((ja-group? (-> self draw art-group data 149))
+      ((ja-group? eichar-flut-double-jump-ja)
        (ja-channel-push! 2 (seconds 0.2))
        )
       (else
         (ja-channel-push! 2 (seconds 0.5))
         )
       )
-    (ja-no-eval :group! (-> self draw art-group data 144) :num! (loop!) :frame-num 0.0)
+    (ja-no-eval :group! eichar-flut-jump-loop-ja :num! (loop!) :frame-num 0.0)
     (ja :chan 1
-        :group! (-> self draw art-group data 147)
+        :group! eichar-flut-jump-forward-loop-ja
         :num! min
         :frame-interp (-> self control unknown-float122)
         )
@@ -1310,7 +1303,7 @@
           (create-splash
             (-> self water)
             (the-as float 0.6)
-            (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 37))
+            (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index eichar-lod0-jg mouth))
             0
             (-> self control transv)
             )
@@ -1320,7 +1313,7 @@
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.02))
     (sound-play "flut-hit")
-    (ja :group! (-> self draw art-group data 150) :num! min)
+    (ja :group! eichar-flut-running-attack-ja :num! min)
     (set! (-> self control dynam gravity-max) 368640.0)
     (set! (-> self control dynam gravity-length) 368640.0)
     (let ((f28-0 0.0)
@@ -1340,9 +1333,9 @@
                             (time-elapsed? (-> self control unknown-dword11) (-> *FLUT-bank* ground-timeout))
                             (>= 0.0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))
                             (let ((v1-39 (ja-group)))
-                              (or (not (or (= v1-39 (-> self draw art-group data 59))
-                                           (= v1-39 (-> self draw art-group data 60))
-                                           (= v1-39 (-> self draw art-group data 61))
+                              (or (not (or (= v1-39 eichar-attack-punch-ja)
+                                           (= v1-39 eichar-attack-punch-end-ja)
+                                           (= v1-39 eichar-attack-punch-alt-end-ja)
                                            )
                                        )
                                   (< 4096.0 (target-height-above-ground))
@@ -1389,9 +1382,9 @@
                (time-elapsed? (-> self control unknown-dword11) (-> *FLUT-bank* ground-timeout))
                (>= 0.0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))
                (let ((v1-105 (ja-group)))
-                 (or (not (or (= v1-105 (-> self draw art-group data 59))
-                              (= v1-105 (-> self draw art-group data 60))
-                              (= v1-105 (-> self draw art-group data 61))
+                 (or (not (or (= v1-105 eichar-attack-punch-ja)
+                              (= v1-105 eichar-attack-punch-end-ja)
+                              (= v1-105 eichar-attack-punch-alt-end-ja)
                               )
                           )
                      (< 4096.0 (target-height-above-ground))
@@ -1405,7 +1398,7 @@
         (if (not (ja-done? 0))
             (ja-channel-push! 1 (seconds 0.05))
             )
-        (ja-no-eval :group! (-> self draw art-group data 151) :num! (seek!) :frame-num 0.0)
+        (ja-no-eval :group! eichar-flut-running-attack-end-ja :num! (seek!) :frame-num 0.0)
         (until (ja-done? 0)
           (compute-alignment! (-> self align))
           (align! (-> self align) (align-opts adjust-xz-vel) (the-as float 1.0) (the-as float 1.0) f30-0)
@@ -1517,10 +1510,7 @@
   :code (behavior ((arg0 float))
     (sound-play "flut-hit" :pitch -0.5)
     (ja-channel-push! 1 (seconds 0.05))
-    (ja-no-eval :group! (-> self draw art-group data 152)
-                :num! (seek! (ja-aframe (the-as float 8.0) 0))
-                :frame-num 0.0
-                )
+    (ja-no-eval :group! eichar-flut-air-attack-ja :num! (seek! (ja-aframe (the-as float 8.0) 0)) :frame-num 0.0)
     (until (ja-done? 0)
       (compute-alignment! (-> self align))
       (align!
@@ -1533,10 +1523,7 @@
       (suspend)
       (ja :num! (seek! (ja-aframe (the-as float 8.0) 0)))
       )
-    (ja-no-eval :group! (-> self draw art-group data 152)
-                :num! (seek!)
-                :frame-num (ja-aframe (the-as float 8.0) 0)
-                )
+    (ja-no-eval :group! eichar-flut-air-attack-ja :num! (seek!) :frame-num (ja-aframe (the-as float 8.0) 0))
     (until (ja-done? 0)
       (compute-alignment! (-> self align))
       (align!
@@ -1549,7 +1536,7 @@
       (suspend)
       (ja :num! (seek!))
       )
-    (ja :group! (-> self draw art-group data 153) :num! min)
+    (ja :group! eichar-flut-air-attack-loop-ja :num! min)
     (loop
       (suspend)
       )
@@ -1587,7 +1574,7 @@
   :trans (-> target-flut-hit-ground trans)
   :code (behavior ()
     (ja-channel-set! 1)
-    (ja-no-eval :group! (-> self draw art-group data 154)
+    (ja-no-eval :group! eichar-flut-air-attack-land-ja
                 :num! (seek! (ja-aframe (the-as float 22.0) 0))
                 :frame-num 0.0
                 )
@@ -1598,10 +1585,7 @@
       (ja :num! (seek! (ja-aframe (the-as float 22.0) 0)))
       )
     (target-danger-set! 'harmless #f)
-    (ja-no-eval :group! (-> self draw art-group data 154)
-                :num! (seek!)
-                :frame-num (ja-aframe (the-as float 22.0) 0)
-                )
+    (ja-no-eval :group! eichar-flut-air-attack-land-ja :num! (seek!) :frame-num (ja-aframe (the-as float 22.0) 0))
     (until (ja-done? 0)
       (compute-alignment! (-> self align))
       (align! (-> self align) (align-opts adjust-xz-vel) (the-as float 1.0) (the-as float 1.0) (the-as float 1.0))
@@ -1742,17 +1726,17 @@
         (let ((f30-0 1.0))
           (case (-> gp-0 angle)
             (('shove)
-             (when (not (ja-group? (-> self draw art-group data 158)))
+             (when (not (ja-group? eichar-flut-smack-surface-ja))
                (ja-channel-set! 1)
-               (ja :group! (-> self draw art-group data 158) :num! min)
+               (ja :group! eichar-flut-smack-surface-ja :num! min)
                )
              (sound-play "smack-surface")
              (sound-play "flut-hit" :pitch 1)
              )
             (else
-              (when (not (ja-group? (-> self draw art-group data 157)))
+              (when (not (ja-group? eichar-flut-hit-back-ja))
                 (ja-channel-push! 1 (seconds 0.075))
-                (ja :group! (-> self draw art-group data 157) :num! min)
+                (ja :group! eichar-flut-hit-back-ja :num! min)
                 )
               )
             )
@@ -1848,7 +1832,7 @@
       (else
         (set! (-> self control unknown-surface00) *neutral-mods*)
         (ja-channel-push! 1 (seconds 0.1))
-        (ja-no-eval :group! (-> self draw art-group data 160) :num! (seek!) :frame-num 0.0)
+        (ja-no-eval :group! eichar-flut-deatha-ja :num! (seek!) :frame-num 0.0)
         (until (ja-done? 0)
           (compute-alignment! (-> self align))
           (let ((gp-5 (new 'stack-no-clear 'vector)))
@@ -1912,10 +1896,7 @@
     (let ((gp-1 #f))
       (sound-play "uppercut")
       (ja-channel-push! 1 (seconds 0.05))
-      (ja-no-eval :group! (-> self draw art-group data 155)
-                  :num! (seek! (ja-aframe (the-as float 24.0) 0))
-                  :frame-num 0.0
-                  )
+      (ja-no-eval :group! eichar-flut-get-on-ja :num! (seek! (ja-aframe (the-as float 24.0) 0)) :frame-num 0.0)
       (until (ja-done? 0)
         (when (and (not gp-1) (= (-> self skel root-channel 0) (-> self skel channel)))
           (send-event (ppointer->process (-> self manipy)) 'anim-mode 'clone-anim)
@@ -2016,7 +1997,7 @@
         )
       (sound-play "flut-coo" :vol 90 :pitch -0.5)
       (ja-channel-push! 1 (seconds 0.05))
-      (ja-no-eval :group! (-> self draw art-group data 156) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! eichar-flut-get-off-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
@@ -2028,7 +2009,7 @@
         )
       (rot->dir-targ! (-> self control))
       (ja-post)
-      (vector<-cspace! gp-0 (-> self node-list data 3))
+      (vector<-cspace! gp-0 (joint-node-index eichar-lod0-jg main))
       (+! (-> gp-0 y) -5896.192)
       (move-to-point! (-> self control) gp-0)
       )
@@ -2074,10 +2055,7 @@
     )
   :code (behavior ((arg0 symbol))
     (ja-channel-set! 1)
-    (ja-no-eval :group! (-> self draw art-group data 35)
-                :num! (seek!)
-                :frame-num (ja-aframe (the-as float 42.0) 0)
-                )
+    (ja-no-eval :group! eichar-jump-land-ja :num! (seek!) :frame-num (ja-aframe (the-as float 42.0) 0))
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))

test/decompiler/reference/jak1/levels/jungle/bouncer_REF.gc

@@ -60,7 +60,7 @@
       )
     )
   :code (behavior ()
-    (ja :group! (-> self draw art-group data 2) :num! min)
+    (ja :group! bounceytarp-idle-ja :num! min)
     (transform-post)
     (loop
       (logior! (-> self mask) (process-mask sleep))
@@ -113,7 +113,7 @@
 (defstate bouncer-fire (springbox)
   :code (behavior ()
     (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 178 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num (ja-aframe 6.0 0))
+    (ja-no-eval :group! bounceytarp-idle-ja :num! (seek!) :frame-num (ja-aframe 6.0 0))
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))

test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc

@@ -1814,13 +1814,13 @@
   :trans (behavior ()
     (when (-> self training)
       (let ((gp-0 (new-stack-vector0)))
-        (vector<-cspace! gp-0 (-> self node-list data 74))
+        (vector<-cspace! gp-0 (joint-node-index fisher-lod0-jg mainA))
         (launch-particles (-> *part-id-table* 2001) gp-0)
         (fisher-fish-water gp-0 (+ 32768.0 (vector-y-angle (-> self node-list data 75 bone transform vector 1))))
-        (vector<-cspace! gp-0 (-> self node-list data 77))
+        (vector<-cspace! gp-0 (joint-node-index fisher-lod0-jg mainB))
         (launch-particles (-> *part-id-table* 2001) gp-0)
         (fisher-fish-water gp-0 (+ 32768.0 (vector-y-angle (-> self node-list data 78 bone transform vector 1))))
-        (vector<-cspace! gp-0 (-> self node-list data 80))
+        (vector<-cspace! gp-0 (joint-node-index fisher-lod0-jg top))
         (launch-particles (-> *part-id-table* 828) gp-0)
         (launch-particles (-> *part-id-table* 2013) gp-0)
         (fisher-fish-water gp-0 (+ 32768.0 (vector-y-angle (-> self node-list data 80 bone transform vector 1))))
@@ -2139,11 +2139,11 @@
         )
       (let ((v1-35 (-> self manipy 0 node-list data)))
         (set! (-> v1-35 0 param0) cspace<-cspace+quaternion!)
-        (set! (-> v1-35 0 param1) (the-as basic (-> self node-list data 23)))
+        (set! (-> v1-35 0 param1) (the-as basic (joint-node-index eichar-lod0-jg sk_rhand)))
         (set! (-> v1-35 0 param2) (the-as basic (-> self control quat)))
         )
       )
-    (ja :group! (-> self draw art-group data 99) :num! (identity (ja-aframe 15.0 0)))
+    (ja :group! eichar-fishing-ja :num! (identity (ja-aframe 15.0 0)))
     (let ((s5-2 (new 'stack-no-clear 'vector)))
       (until (-> self control unknown-spoolanim00)
         (let ((v1-42 (handle->process arg0)))
@@ -2176,7 +2176,7 @@
     (case (-> self control unknown-spoolanim00)
       (('lose)
        (ja-channel-push! 1 (seconds 0.1))
-       (ja-no-eval :group! (-> self draw art-group data 100) :num! (seek!) :frame-num 0.0)
+       (ja-no-eval :group! eichar-fishing-lose-ja :num! (seek!) :frame-num 0.0)
        (until (ja-done? 0)
          (suspend)
          (ja :num! (seek!))

test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc

@@ -55,7 +55,7 @@
   :code (behavior ()
     (transform-post)
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! logtrap-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (when (logtest? (-> self draw status) (draw-status was-drawn))
           (cond
@@ -140,7 +140,7 @@
 (defstate towertop-idle (towertop)
   :code (behavior ()
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek! max 0.4) :frame-num 0.0)
+      (ja-no-eval :group! towertop-idle-ja :num! (seek! max 0.4) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! max 0.4))
@@ -210,7 +210,7 @@
   :trans rider-trans
   :code (behavior ()
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek! max (* 0.5 (-> self speed))) :frame-num 0.0)
+      (ja-no-eval :group! lurkerm-tall-sail-idle-ja :num! (seek! max (* 0.5 (-> self speed))) :frame-num 0.0)
       (until (ja-done? 0)
         (quaternion-rotate-local-y!
           (-> self root-override quat)
@@ -441,7 +441,7 @@
   :trans rider-trans
   :code (behavior ()
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! max (-> self speed)) :frame-num 0.0)
+      (ja-no-eval :group! lurkerm-piston-idle-ja :num! (seek! max (-> self speed)) :frame-num 0.0)
       (until (ja-done? 0)
         (let ((gp-0 (new-stack-vector0)))
           (set! (-> gp-0 quad) (-> self base quad))
@@ -660,8 +660,8 @@
   :virtual #t
   :code (behavior ()
     (ambient-hint-spawn "gamcam30" (the-as vector #f) *entity-pool* 'camera)
-    (ja :group! (-> self draw art-group data 8))
-    (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek! (ja-aframe 0.0 0)) :frame-num 0.0)
+    (ja :group! junglecam-precurbridgecam-ja)
+    (ja-no-eval :group! junglecam-precurbridgecam-ja :num! (seek! (ja-aframe 0.0 0)) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek! (ja-aframe 0.0 0)))
@@ -738,7 +738,7 @@
       )
     )
   :code (behavior ()
-    (ja :group! (-> self draw art-group data 3) :num! min)
+    (ja :group! precurbridge-idle-ja :num! min)
     (transform-post)
     (loop
       (when (and *target*
@@ -799,7 +799,7 @@
   :code (behavior ()
     (process-entity-status! self (entity-perm-status complete) #t)
     (sound-play "blue-eco-on" :position (the-as symbol (-> self root-override trans)))
-    (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.25) :frame-num 0.0)
+    (ja-no-eval :group! precurbridge-idle-ja :num! (seek! max 0.25) :frame-num 0.0)
     (until (ja-done? 0)
       (if (rand-vu-percent? 0.1)
           (spawn-projectile-blue *target*)
@@ -833,7 +833,7 @@
     (set! (-> self draw bounds w) 81920.0)
     (when arg0
       (ja-channel-set! 1)
-      (ja :group! (-> self draw art-group data 4) :num! min)
+      (ja :group! precurbridge-float-ja :num! min)
       )
     (ja-post)
     (update-transforms! (-> self root-override))
@@ -844,15 +844,15 @@
           )
       (cond
         ((and *target* (>= 61440.0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans))))
-         (when (not (ja-group? (-> self draw art-group data 5)))
+         (when (not (ja-group? precurbridge-static-ja))
            (ja-channel-push! 1 (seconds 0.2))
-           (ja :group! (-> self draw art-group data 5) :num! min)
+           (ja :group! precurbridge-static-ja :num! min)
            )
          )
         (else
-          (when (not (ja-group? (-> self draw art-group data 4)))
+          (when (not (ja-group? precurbridge-float-ja))
             (ja-channel-push! 1 (seconds 0.2))
-            (ja :group! (-> self draw art-group data 4) :num! min)
+            (ja :group! precurbridge-float-ja :num! min)
             )
           )
         )

test/decompiler/reference/jak1/levels/jungleb/aphid_REF.gc

@@ -81,14 +81,14 @@
       (loop
         (ja-channel-push! 1 (seconds 0.05))
         (sound-play "aphid-spike-out")
-        (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0)
+        (ja-no-eval :group! aphid-lurker-spike-out-ja :num! (seek!) :frame-num 0.0)
         (until (ja-done? 0)
           (suspend)
           (ja :num! (seek!))
           )
         (aphid-invulnerable)
         (ja-channel-push! 1 (seconds 0.1))
-        (ja :group! (-> self draw art-group data 5))
+        (ja :group! aphid-lurker-walk-deadly-ja)
         (ja :num-func num-func-identity :frame-num 0.0)
         (let ((f30-0 (nav-enemy-rnd-float-range 0.9 1.1))
               (s5-1 (current-time))
@@ -102,7 +102,7 @@
         (aphid-vulnerable)
         (ja-channel-push! 1 (seconds 0.05))
         (sound-play "aphid-spike-in")
-        (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek! 0.0) :frame-num max)
+        (ja-no-eval :group! aphid-lurker-spike-out-ja :num! (seek! 0.0) :frame-num max)
         (until (ja-done? 0)
           (suspend)
           (ja :num! (seek! 0.0))
@@ -134,7 +134,7 @@
                 (and (nav-enemy-player-vulnerable?) (nav-enemy-rnd-percent? 0.5))
                 )
         (ja-channel-push! 1 (seconds 0.1))
-        (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek! max f30-0) :frame-num 0.0)
+        (ja-no-eval :group! aphid-lurker-win-ja :num! (seek! max f30-0) :frame-num 0.0)
         (until (ja-done? 0)
           (suspend)
           (ja :num! (seek! max f30-0))
@@ -145,7 +145,7 @@
           (logior! (-> self nav-enemy-flags) (nav-enemy-flags enable-travel))
           (ja-no-eval :num! (loop!))
           (ja-channel-push! 1 (seconds 0.2))
-          (ja :group! (-> self draw art-group data 4))
+          (ja :group! aphid-lurker-walk-ja)
           (ja :num-func num-func-identity :frame-num 0.0)
           (until (nav-enemy-facing-player? 1820.4445)
             (ja-blend-eval)
@@ -155,10 +155,10 @@
           (logclear! (-> self nav-enemy-flags) (nav-enemy-flags enable-travel))
           )
         (when (nav-enemy-rnd-percent? 0.3)
-          (if (not (ja-group? (-> self draw art-group data 10)))
+          (if (not (ja-group? aphid-lurker-win-ja))
               (ja-channel-push! 1 (seconds 0.1))
               )
-          (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek! max f30-0) :frame-num 0.0)
+          (ja-no-eval :group! aphid-lurker-win-ja :num! (seek! max f30-0) :frame-num 0.0)
           (until (ja-done? 0)
             (suspend)
             (ja :num! (seek! max f30-0))
@@ -184,7 +184,7 @@
                  )
                12743.111
                )
-        (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0)
+        (ja-no-eval :group! aphid-lurker-give-up-ja :num! (seek!) :frame-num 0.0)
         (until (ja-done? 0)
           (suspend)
           (ja :num! (seek!))
@@ -193,7 +193,7 @@
       )
     (logclear! (-> self nav flags) (nav-control-flags navcf17 navcf19))
     (nav-enemy-get-new-patrol-point)
-    (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! aphid-lurker-give-up-hop-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (seek-to-point-toward-point!
         (-> self collide-info)

test/decompiler/reference/jak1/levels/jungleb/jungleb-obs_REF.gc

@@ -285,7 +285,7 @@
             )
       (save-reminder (get-task-control (-> self entity extra perm task)) 2 0)
       (sound-play "jngb-eggtop-seq")
-      (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! eggtop-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
@@ -297,7 +297,7 @@
           (entity-task-complete-on a0-20)
           )
       )
-    (ja :group! (-> self draw art-group data 2) :num! max)
+    (ja :group! eggtop-idle-ja :num! max)
     (suspend)
     (logior! (-> self mask) (process-mask sleep))
     (suspend)

test/decompiler/reference/jak1/levels/lavatube/assistant-lavatube_REF.gc

@@ -121,7 +121,7 @@
     (loop
       (when (!= (ja-group) (get-art-elem self))
         (ja-channel-push! 1 (seconds 0.05))
-        (ja :group! (-> self draw art-group data 3))
+        (ja :group! assistant-lavatube-start-idle-ja)
         )
       (let* ((f30-0 2.0)
              (v1-7 (/ (the-as int (rand-uint31-gen *random-generator*)) 256))
@@ -136,7 +136,7 @@
           )
         )
       (ja-channel-push! 1 (seconds 0.05))
-      (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! assistant-lavatube-start-idle-b-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))

test/decompiler/reference/jak1/levels/lavatube/lavatube-energy_REF.gc

@@ -1104,9 +1104,18 @@
     (energyarm-trans)
     (cond
       ((handle->process (-> self ball))
-       (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 6)))
-       (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 5)))
-       (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 4)))
+       (spawn
+         (-> self part)
+         (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index energyarm-lod0-jg zapa))
+         )
+       (spawn
+         (-> self part)
+         (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index energyarm-lod0-jg zapb))
+         )
+       (spawn
+         (-> self part)
+         (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index energyarm-lod0-jg zapc))
+         )
        )
       ((!= (-> self ball) #f)
        (set! (-> self ball) (the-as handle #f))

test/decompiler/reference/jak1/levels/maincave/gnawer_REF.gc

@@ -966,11 +966,11 @@
       (ja-no-eval :group! gnawer-up-to-chew-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (let ((gp-3 (new 'stack-no-clear 'vector)))
-          (vector<-cspace! gp-3 (-> self node-list data 34))
+          (vector<-cspace! gp-3 (joint-node-index gnawer-lod0-jg nandibleR))
           (spawn (-> self part2) gp-3)
           )
         (let ((gp-4 (new 'stack-no-clear 'vector)))
-          (vector<-cspace! gp-4 (-> self node-list data 33))
+          (vector<-cspace! gp-4 (joint-node-index gnawer-lod0-jg mandibleL))
           (spawn (-> self part2) gp-4)
           )
         (suspend)
@@ -983,11 +983,11 @@
           (ja-no-eval :group! gnawer-chew-ja :num! (seek! max (-> self anim-speed)) :frame-num 0.0)
           (until (ja-done? 0)
             (let ((s4-1 (new 'stack-no-clear 'vector)))
-              (vector<-cspace! s4-1 (-> self node-list data 34))
+              (vector<-cspace! s4-1 (joint-node-index gnawer-lod0-jg nandibleR))
               (spawn (-> self part2) s4-1)
               )
             (let ((s4-2 (new 'stack-no-clear 'vector)))
-              (vector<-cspace! s4-2 (-> self node-list data 33))
+              (vector<-cspace! s4-2 (joint-node-index gnawer-lod0-jg mandibleL))
               (spawn (-> self part2) s4-2)
               )
             (update! (-> self sound2))

test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc

@@ -171,7 +171,7 @@
     )
   :code (behavior ()
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! cavecrusher-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (update! (-> self sound))
         (suspend)
@@ -266,7 +266,7 @@
       )
     )
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! cavetrapdoor-idle-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (transform-post)
       (suspend)
@@ -286,13 +286,13 @@
         (suspend)
         )
       )
-    (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! cavetrapdoor-bob-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
       )
     (clear-collide-with-as (-> self root-override))
-    (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek! (ja-aframe 290.0 0)) :frame-num 0.0)
+    (ja-no-eval :group! cavetrapdoor-swing-ja :num! (seek! (ja-aframe 290.0 0)) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek! (ja-aframe 290.0 0)))
@@ -313,14 +313,14 @@
                     (not (logtest? (-> *target* control root-prim prim-core action) (collide-action edgegrab-cam)))
                     )
                )
-      (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! cavetrapdoor-idle-down-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
         )
       (label cfg-14)
       )
-    (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! cavetrapdoor-reset-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (when (and (and *target* (>= 28672.0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans))))
                  (or (and (logtest? (-> *target* control unknown-surface00 flags) (surface-flags jump))

test/decompiler/reference/jak1/levels/maincave/mother-spider-egg_REF.gc

@@ -264,7 +264,7 @@
   :code (behavior ()
     (ja-channel-push! 1 0)
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max (-> self anim-speed)) :frame-num 0.0)
+      (ja-no-eval :group! spider-egg-idle-ja :num! (seek! max (-> self anim-speed)) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! max (-> self anim-speed)))
@@ -320,7 +320,7 @@
         (quaternion-from-two-vectors! s5-0 s4-0 s3-0)
         )
       (quaternion*! s5-0 s5-0 gp-0)
-      (ja-no-eval :group! (-> self draw art-group data 11) :num! (seek! max 1.3) :frame-num 0.0)
+      (ja-no-eval :group! spider-egg-bounce-ja :num! (seek! max 1.3) :frame-num 0.0)
       (until (ja-done? 0)
         (let* ((f0-8 (ja-frame-num 0))
                (v1-19 (ja-group))
@@ -333,7 +333,7 @@
         )
       )
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max (-> self anim-speed)) :frame-num 0.0)
+      (ja-no-eval :group! spider-egg-idle-ja :num! (seek! max (-> self anim-speed)) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! max (-> self anim-speed)))
@@ -376,7 +376,7 @@
       )
     (lods-assign! (-> self draw) (-> self broken-look))
     (ja-channel-push! 1 (seconds 0.2))
-    (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! spider-egg-crack-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -412,7 +412,7 @@
       (-> self root-override trans)
       :to *entity-pool*
       )
-    (ja-no-eval :group! (-> self draw art-group data 12) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! spider-egg-die-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -449,7 +449,7 @@
       )
     (lods-assign! (-> self draw) (-> self broken-look))
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 12) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! spider-egg-die-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))

test/decompiler/reference/jak1/levels/maincave/mother-spider_REF.gc

@@ -1042,7 +1042,7 @@
         (go mother-spider-traveling (the-as uint 0))
         )
     (let ((gp-0 (new 'stack-no-clear 'vector)))
-      (vector<-cspace! gp-0 (-> self node-list data 6))
+      (vector<-cspace! gp-0 (joint-node-index mother-spider-lod0-jg bodA))
       (if (or (logtest? (-> *target* state-flags)
                         (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying)
                         )
@@ -1080,7 +1080,7 @@
         (set! (-> gp-2 quad) (-> self root-override trans quad))
         (set! (-> gp-2 w) 4096.0)
         (when (sphere-in-view-frustum? (the-as sphere gp-2))
-          (vector<-cspace! gp-2 (-> self node-list data 21))
+          (vector<-cspace! gp-2 (joint-node-index mother-spider-lod0-jg jaw))
           (set! (-> s5-2 quad) (-> (target-pos 0) quad))
           (+! (-> s5-2 y) 4915.2)
           (cond
@@ -1182,7 +1182,7 @@
                   (s5-0 (new 'stack-no-clear 'vector))
                   (s2-0 (new 'stack-no-clear 'vector))
                   )
-              (vector<-cspace! s4-0 (-> self node-list data 21))
+              (vector<-cspace! s4-0 (joint-node-index mother-spider-lod0-jg jaw))
               (set! (-> s5-0 quad) (-> (target-pos 0) quad))
               (+! (-> s5-0 y) 4915.2)
               (when (< 24576.0 (vector-vector-distance s5-0 s4-0))

test/decompiler/reference/jak1/levels/misty/babak-with-cannon_REF.gc

@@ -109,7 +109,7 @@ nav-enemy-default-event-handler
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.075))
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! babak-charge-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
@@ -234,7 +234,7 @@ nav-enemy-default-event-handler
         )
       )
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 17) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! babak-look-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -255,7 +255,7 @@ nav-enemy-default-event-handler
     (nav-enemy-initialize-jump (-> self entity extra trans))
     (nav-enemy-neck-control-look-at)
     (logclear! (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate enable-travel))
-    (ja-no-eval :group! (-> self draw art-group data 17) :num! (seek! 0.0 2.0) :frame-num max)
+    (ja-no-eval :group! babak-look-ja :num! (seek! 0.0 2.0) :frame-num max)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek! 0.0 2.0))

test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc

@@ -1281,7 +1281,7 @@
   :event mis-bone-bridge-event-handler
   :trans rider-trans
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! mis-bone-bridge-bumped-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -1300,7 +1300,7 @@
     (if (zero? (-> self hit-points))
         (go mis-bone-bridge-fall #f)
         )
-    (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! mis-bone-bridge-kicked-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -1766,7 +1766,7 @@
     )
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.1))
-    (ja :group! (-> self draw art-group data 2))
+    (ja :group! mis-bone-platform-idle-ja)
     (ja :num-func num-func-identity :frame-num 0.0)
     (loop
       (suspend)

test/decompiler/reference/jak1/levels/misty/misty-teetertotter_REF.gc

@@ -69,7 +69,7 @@
       )
     )
   :code (behavior ()
-    (ja :group! (-> self draw art-group data 4) :num! min)
+    (ja :group! teetertotter-idle-ja :num! min)
     (loop
       (suspend)
       )
@@ -115,7 +115,7 @@
     )
   :code (behavior ()
     (set! (-> self launched-player) #f)
-    (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! teetertotter-idle-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (let ((f0-4 (ja-aframe-num 0)))
         (set! (-> self in-launch-window) (and (>= f0-4 76.0) (>= 82.0 f0-4)))
@@ -134,7 +134,7 @@
 ;; failed to figure out what this is:
 (defstate teetertotter-bend (teetertotter)
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! teetertotter-landing-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))

test/decompiler/reference/jak1/levels/misty/misty-warehouse_REF.gc

@@ -46,7 +46,7 @@
       )
     )
   :code (behavior ()
-    (ja :group! (-> self draw art-group data 2) :num! min)
+    (ja :group! silostep-idle-ja :num! min)
     (transform-post)
     (loop
       (suspend)
@@ -113,7 +113,7 @@
   :code (behavior ((arg0 symbol))
     (process-entity-status! self (entity-perm-status complete) #t)
     (when (not arg0)
-      (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! (-> self anim-limit)) :frame-num 0.0)
+      (ja-no-eval :group! silostep-idle-ja :num! (seek! (-> self anim-limit)) :frame-num 0.0)
       (until (ja-done? 0)
         (rider-trans)
         (rider-post)
@@ -121,7 +121,7 @@
         (ja :num! (seek! (-> self anim-limit)))
         )
       )
-    (ja :group! (-> self draw art-group data 2) :num! (identity (-> self anim-limit)))
+    (ja :group! silostep-idle-ja :num! (identity (-> self anim-limit)))
     (rider-post)
     (loop
       (ja-post)

test/decompiler/reference/jak1/levels/misty/quicksandlurker_REF.gc

@@ -756,7 +756,9 @@
 (defbehavior quicksandlurker-spit quicksandlurker ()
   (let ((gp-0 (new-stack-vector0)))
     (let ((s5-0 (new-stack-vector0)))
-      (set! (-> gp-0 quad) (-> (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 9)) quad))
+      (set! (-> gp-0 quad)
+            (-> (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index quicksandlurker-lod0-jg jawEND)) quad)
+            )
       (vector-! s5-0 (target-pos 5) gp-0)
       (let ((f1-0 (vector-xz-length s5-0)))
         (set! (-> s5-0 y) (fmin (-> s5-0 y) (* 0.5 f1-0)))

test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc

@@ -1046,7 +1046,7 @@
         0
         )
       )
-    (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! ogre-bridge-assemble-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (if (rand-vu-percent? 0.2)
           (spawn-projectile-blue *target*)
@@ -1077,7 +1077,7 @@
       )
     )
   :code (behavior ()
-    (ja :group! (-> self draw art-group data 3) :num! max)
+    (ja :group! ogre-bridge-assemble-ja :num! max)
     (transform-post)
     (loop
       (suspend)
@@ -1114,7 +1114,7 @@
       )
     )
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! ogre-bridge-break-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))

test/decompiler/reference/jak1/levels/racer_common/racer-states_REF.gc

@@ -364,7 +364,7 @@
     )
   :code (behavior ()
     (cond
-      ((ja-group? (-> self draw art-group data 138))
+      ((ja-group? eichar-racer-get-on-ja)
        (ja-no-eval :num! (seek!))
        (while (not (ja-done? 0))
          (suspend)
@@ -372,7 +372,7 @@
          )
        )
       ((let ((v1-16 (ja-group)))
-         (or (or (= v1-16 (-> self draw art-group data 130)) (= v1-16 (-> self draw art-group data 131)))
+         (or (or (= v1-16 eichar-racer-jump-small-ja) (= v1-16 eichar-racer-jump-small-loop-ja))
              (> (-> self racer bounce) 0)
              )
          )
@@ -441,12 +441,12 @@
     (set! (-> self racer bounce) 0)
     (loop
       (let ((gp-3 (current-time)))
-        (when (not (ja-group? (-> self draw art-group data 123)))
+        (when (not (ja-group? eichar-racer-turn-ja))
           (ja-channel-push! 4 (seconds 0.1))
-          (ja :group! (-> self draw art-group data 123) :num! (identity (ja-aframe (-> self racer turn-anim-frame) 0)))
-          (ja :chan 1 :group! (-> self draw art-group data 124) :num! (chan 0))
-          (ja :chan 2 :group! (-> self draw art-group data 125) :num! (chan 0))
-          (ja :chan 3 :group! (-> self draw art-group data 126) :num! (chan 0))
+          (ja :group! eichar-racer-turn-ja :num! (identity (ja-aframe (-> self racer turn-anim-frame) 0)))
+          (ja :chan 1 :group! eichar-racer-turn2-ja :num! (chan 0))
+          (ja :chan 2 :group! eichar-racer-dig-ja :num! (chan 0))
+          (ja :chan 3 :group! eichar-racer-dig2-ja :num! (chan 0))
           )
         (while (not (time-elapsed? gp-3 (seconds 1)))
           (if (or (!= (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) stick0-speed) 0.0)
@@ -460,9 +460,9 @@
           (suspend)
           )
         )
-      (when (not (ja-group? (-> self draw art-group data 133)))
+      (when (not (ja-group? eichar-racer-stance-ja))
         (ja-channel-push! 1 (seconds 0.4))
-        (ja :group! (-> self draw art-group data 133) :num! min)
+        (ja :group! eichar-racer-stance-ja :num! min)
         )
       (while (not (or (!= (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) stick0-speed) 0.0)
                       (or (cpad-hold? (-> self control unknown-cpad-info00 number) l1 r1 x)
@@ -654,12 +654,12 @@
     )
   :code (behavior ((arg0 float) (arg1 float) (arg2 symbol))
     (target-racing-land-anim arg2)
-    (when (not (ja-group? (-> self draw art-group data 123)))
+    (when (not (ja-group? eichar-racer-turn-ja))
       (ja-channel-push! 4 (seconds 0.1))
-      (ja :group! (-> self draw art-group data 123) :num! (identity (ja-aframe (-> self racer turn-anim-frame) 0)))
-      (ja :chan 1 :group! (-> self draw art-group data 124) :num! (chan 0))
-      (ja :chan 2 :group! (-> self draw art-group data 125) :num! (chan 0))
-      (ja :chan 3 :group! (-> self draw art-group data 126) :num! (chan 0))
+      (ja :group! eichar-racer-turn-ja :num! (identity (ja-aframe (-> self racer turn-anim-frame) 0)))
+      (ja :chan 1 :group! eichar-racer-turn2-ja :num! (chan 0))
+      (ja :chan 2 :group! eichar-racer-dig-ja :num! (chan 0))
+      (ja :chan 3 :group! eichar-racer-dig2-ja :num! (chan 0))
       )
     (loop
       (target-racing-turn-anim)
@@ -700,9 +700,9 @@
   :code (behavior ((arg0 float) (arg1 symbol))
     (sound-play "zoomer-crash-2")
     (ja-channel-push! 2 (seconds 0.05))
-    (ja-no-eval :group! (-> self draw art-group data 136) :num! (seek!))
+    (ja-no-eval :group! eichar-racer-smack-ja :num! (seek!))
     (ja :chan 1
-        :group! (-> self draw art-group data 122)
+        :group! eichar-racer-idle-ja
         :num! (identity (ja-aframe 0.0 0))
         :frame-interp (lerp-scale 1.0 0.25 arg0 0.0 122880.0)
         )
@@ -824,7 +824,7 @@
       (else
         (set! (-> self post-hook) target-racing-post)
         (ja-channel-push! 1 (seconds 0.05))
-        (ja-no-eval :group! (-> self draw art-group data 136) :num! (seek!) :frame-num 0.0)
+        (ja-no-eval :group! eichar-racer-smack-ja :num! (seek!) :frame-num 0.0)
         (until (ja-done? 0)
           (suspend)
           (ja :num! (seek!))
@@ -928,7 +928,7 @@
        (case (-> self attack-info mode)
          (('balloonlurker)
           (create-splash (-> self water) 2.0 (-> self control trans) 1 (-> self control transv))
-          (ja-no-eval :group! (-> self draw art-group data 139) :num! (seek! (ja-aframe 240.0 0)) :frame-num 0.0)
+          (ja-no-eval :group! eichar-racer-death-explode-ja :num! (seek! (ja-aframe 240.0 0)) :frame-num 0.0)
           (until (ja-done? 0)
             (set! (-> self racer stick-lock) #t)
             (seek! (-> self control unknown-vector11 y) 6144.0 (* 12288.0 (seconds-per-frame)))
@@ -938,7 +938,7 @@
             )
           )
          (else
-           (ja-no-eval :group! (-> self draw art-group data 139) :num! (seek!) :frame-num 0.0)
+           (ja-no-eval :group! eichar-racer-death-explode-ja :num! (seek!) :frame-num 0.0)
            (until (ja-done? 0)
              (set! (-> self racer stick-lock) #t)
              (send-event *camera* 'joystick 0.0 1.0)
@@ -1081,7 +1081,7 @@
           (gp-1 #f)
           )
       (ja-channel-push! 1 (seconds 0.05))
-      (ja-no-eval :group! (-> self draw art-group data 138) :num! (seek! (ja-aframe 77.0 0)) :frame-num 0.0)
+      (ja-no-eval :group! eichar-racer-get-on-ja :num! (seek! (ja-aframe 77.0 0)) :frame-num 0.0)
       (until (ja-done? 0)
         (when (and (not s5-1) (= (-> self skel root-channel 0) (-> self skel channel)))
           (send-event (ppointer->process (-> self manipy)) 'anim-mode 'clone-anim)
@@ -1184,12 +1184,12 @@
           (set! (-> a0-4 0 deactivate-when-hidden) #t)
           )
       )
-    (when (not (ja-group? (-> self draw art-group data 123)))
+    (when (not (ja-group? eichar-racer-turn-ja))
       (ja-channel-push! 4 (seconds 0.1))
-      (ja :group! (-> self draw art-group data 123) :num! (identity (ja-aframe (-> self racer turn-anim-frame) 0)))
-      (ja :chan 1 :group! (-> self draw art-group data 124) :num! (chan 0))
-      (ja :chan 2 :group! (-> self draw art-group data 125) :num! (chan 0))
-      (ja :chan 3 :group! (-> self draw art-group data 126) :num! (chan 0))
+      (ja :group! eichar-racer-turn-ja :num! (identity (ja-aframe (-> self racer turn-anim-frame) 0)))
+      (ja :chan 1 :group! eichar-racer-turn2-ja :num! (chan 0))
+      (ja :chan 2 :group! eichar-racer-dig-ja :num! (chan 0))
+      (ja :chan 3 :group! eichar-racer-dig2-ja :num! (chan 0))
       )
     (let ((s5-1 (current-time)))
       (until (time-elapsed? s5-1 (seconds 0.5))
@@ -1242,7 +1242,7 @@
         (set! (-> self control unknown-vector103 quad) (-> s4-1 quad))
         )
       (ja-channel-push! 1 (seconds 0.05))
-      (ja-no-eval :group! (-> self draw art-group data 137) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! eichar-racer-get-off-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
@@ -1254,7 +1254,7 @@
         )
       (rot->dir-targ! (-> self control))
       (ja-post)
-      (vector<-cspace! gp-1 (-> self node-list data 3))
+      (vector<-cspace! gp-1 (joint-node-index eichar-lod0-jg main))
       (+! (-> gp-1 y) -5896.192)
       (move-to-point! (-> self control) gp-1)
       )
@@ -1327,7 +1327,7 @@
     )
   :code (behavior ((arg0 symbol))
     (ja-channel-set! 1)
-    (ja-no-eval :group! (-> self draw art-group data 35) :num! (seek!) :frame-num (ja-aframe 42.0 0))
+    (ja-no-eval :group! eichar-jump-land-ja :num! (seek!) :frame-num (ja-aframe 42.0 0))
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -1375,12 +1375,12 @@
     ((-> target-racing-start exit))
     )
   :code (behavior ()
-    (when (not (ja-group? (-> self draw art-group data 123)))
+    (when (not (ja-group? eichar-racer-turn-ja))
       (ja-channel-push! 4 (seconds 0.1))
-      (ja :group! (-> self draw art-group data 123) :num! (identity (ja-aframe (-> self racer turn-anim-frame) 0)))
-      (ja :chan 1 :group! (-> self draw art-group data 124) :num! (chan 0))
-      (ja :chan 2 :group! (-> self draw art-group data 125) :num! (chan 0))
-      (ja :chan 3 :group! (-> self draw art-group data 126) :num! (chan 0))
+      (ja :group! eichar-racer-turn-ja :num! (identity (ja-aframe (-> self racer turn-anim-frame) 0)))
+      (ja :chan 1 :group! eichar-racer-turn2-ja :num! (chan 0))
+      (ja :chan 2 :group! eichar-racer-dig-ja :num! (chan 0))
+      (ja :chan 3 :group! eichar-racer-dig2-ja :num! (chan 0))
       )
     (loop
       (target-racing-turn-anim)

test/decompiler/reference/jak1/levels/racer_common/target-racer_REF.gc

@@ -1112,7 +1112,7 @@
               (ja-channel-push! 1 arg1)
               (ja-channel-push! 1 (seconds 0.125))
               )
-          (ja-no-eval :group! (-> self draw art-group data 130) :num! (seek!) :frame-num f30-0)
+          (ja-no-eval :group! eichar-racer-jump-small-ja :num! (seek!) :frame-num f30-0)
           (set! s4-0 s5-0)
           )
         )
@@ -1128,8 +1128,8 @@
       )
     )
   (ja-channel-set! 2)
-  (ja :group! (-> self draw art-group data 131) :num! min)
-  (ja :chan 1 :group! (-> self draw art-group data 132) :num! (identity (ja-aframe 44.0 0)))
+  (ja :group! eichar-racer-jump-small-loop-ja :num! min)
+  (ja :chan 1 :group! eichar-racer-jump-small-land-ja :num! (identity (ja-aframe 44.0 0)))
   (let ((f30-1 0.0))
     (loop
       (suspend)
@@ -1152,7 +1152,7 @@
   (ja-channel-push! 1 (seconds 0.07))
   (cond
     ((= arg0 'high-jump)
-     (ja-no-eval :group! (-> self draw art-group data 135) :num! (seek!) :frame-num 0.0)
+     (ja-no-eval :group! eichar-racer-jump-high-land-ja :num! (seek!) :frame-num 0.0)
      (until (ja-done? 0)
        (if (>= (-> self racer slide-mode) 0)
            (goto cfg-23)
@@ -1162,7 +1162,7 @@
        )
      )
     ((= arg0 'jump)
-     (ja-no-eval :group! (-> self draw art-group data 129) :num! (seek!) :frame-num (ja-aframe 44.0 0))
+     (ja-no-eval :group! eichar-racer-jump-land-ja :num! (seek!) :frame-num (ja-aframe 44.0 0))
      (until (ja-done? 0)
        (if (>= (-> self racer slide-mode) 0)
            (goto cfg-23)
@@ -1172,7 +1172,7 @@
        )
      )
     (else
-      (ja-no-eval :group! (-> self draw art-group data 132) :num! (seek!) :frame-num (ja-aframe 44.0 0))
+      (ja-no-eval :group! eichar-racer-jump-small-land-ja :num! (seek!) :frame-num (ja-aframe 44.0 0))
       (until (ja-done? 0)
         (if (>= (-> self racer slide-mode) 0)
             (goto cfg-23)

test/decompiler/reference/jak1/levels/rolling/rolling-lightning-mole_REF.gc

@@ -633,9 +633,9 @@
 
 ;; definition for function lightning-mole-run-code
 (defbehavior lightning-mole-run-code lightning-mole ()
-  (when (!= (ja-group) (-> self draw art-group data 7))
+  (when (!= (ja-group) lightning-mole-run-ja)
     (ja-channel-push! 1 (seconds 0.2))
-    (ja :group! (-> self draw art-group data 7))
+    (ja :group! lightning-mole-run-ja)
     )
   (loop
     (ja :num! (loop! (-> self speed-adjust)))
@@ -737,7 +737,7 @@
   :trans (behavior ()
     (when (task-closed? (-> self entity extra perm task) (task-status need-introduction))
       (ja-channel-set! 1)
-      (ja :group! (-> self draw art-group data 5))
+      (ja :group! lightning-mole-idle-ja)
       (restore-collide-with-as (-> self collide-info))
       (go-virtual nav-enemy-idle)
       )
@@ -781,7 +781,7 @@
           )
       (ambient-hint-spawn "gamcam20" (the-as vector #f) *entity-pool* 'camera)
       (ja-channel-push! 1 (seconds 0.2))
-      (ja-no-eval :group! (-> self draw art-group data 12) :num! (seek! max f30-0) :frame-num 0.0)
+      (ja-no-eval :group! lightning-mole-dive-ja :num! (seek! max f30-0) :frame-num 0.0)
       (until (ja-done? 0)
         (let ((s5-0 (new 'stack-no-clear 'vector)))
           (set! (-> *camera-other-fov* data) 11650.845)
@@ -849,7 +849,7 @@
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.2))
     (let ((f30-0 (nav-enemy-rnd-float-range 0.9 1.1)))
-      (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek! max f30-0) :frame-num 0.0)
+      (ja-no-eval :group! lightning-mole-yelp-ja :num! (seek! max f30-0) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! max f30-0))
@@ -1379,7 +1379,7 @@
     )
   :code (behavior ()
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 13) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! lightning-mole-peep-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))

test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc

@@ -357,7 +357,7 @@
     (dark-plant-randomize self)
     (logclear! (-> self draw status) (draw-status hidden))
     (sound-play "darkvine-grow")
-    (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! dark-plant-sprout-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -408,7 +408,7 @@
     (spawn (-> self part) (-> self root trans))
     (ja-channel-push! 1 (seconds 0.2))
     (sound-play "darkvine-kill")
-    (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! dark-plant-death-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -444,17 +444,15 @@
           )
         )
       (let ((gp-1 (-> self skel root-channel 0)))
-        (set! (-> gp-1 frame-group) (the-as art-joint-anim (-> self draw art-group data 2)))
-        (set! (-> gp-1 param 0)
-              (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) data 0 length) -1))
-              )
+        (set! (-> gp-1 frame-group) (the-as art-joint-anim dark-plant-idle-ja))
+        (set! (-> gp-1 param 0) (the float (+ (-> (the-as art-joint-anim dark-plant-idle-ja) data 0 length) -1)))
         (let ((f30-1 0.9)
               (f28-0 0.25)
               )
           (set! (-> gp-1 param 1) (+ f30-1 (* f28-0 (rand-float-gen))))
           )
         (set! (-> gp-1 frame-num) 0.0)
-        (joint-control-channel-group! gp-1 (the-as art-joint-anim (-> self draw art-group data 2)) num-func-seek!)
+        (joint-control-channel-group! gp-1 (the-as art-joint-anim dark-plant-idle-ja) num-func-seek!)
         )
       (until (ja-done? 0)
         (suspend)
@@ -478,13 +476,11 @@
   :trans dark-plant-trans
   :code (behavior ()
     (let ((gp-0 (-> self skel root-channel 0)))
-      (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 2)))
-      (set! (-> gp-0 param 0)
-            (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) data 0 length) -1))
-            )
+      (set! (-> gp-0 frame-group) (the-as art-joint-anim dark-plant-idle-ja))
+      (set! (-> gp-0 param 0) (the float (+ (-> (the-as art-joint-anim dark-plant-idle-ja) data 0 length) -1)))
       (set! (-> gp-0 param 1) 1.0)
       (set! (-> gp-0 frame-num) (* (rand-float-gen) (the float (ja-num-frames 0))))
-      (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 2)) num-func-seek!)
+      (joint-control-channel-group! gp-0 (the-as art-joint-anim dark-plant-idle-ja) num-func-seek!)
       )
     (until (ja-done? 0)
       (suspend)
@@ -609,7 +605,7 @@
 (defstate happy-plant-opened (happy-plant)
   :code (behavior ()
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! happy-plant-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
@@ -665,11 +661,11 @@
             :command-list '((0 send-event target draw #f) (10000 send-event target draw #t))
             )
           (the-as art-joint-anim #f)
-          (the-as art-joint-anim (-> self draw art-group data 4))
+          (the-as art-joint-anim happy-plant-idle-ja)
           (the-as (function process-drawable symbol) false-func)
           )
         (ja-channel-set! 1)
-        (ja :group! (-> self draw art-group data 4))
+        (ja :group! happy-plant-idle-ja)
         (if (handle->process (the-as int gp-2))
             (deactivate (-> gp-2 process 0))
             )
@@ -677,7 +673,7 @@
           (when gp-3
             (send-event gp-3 'stop-cloning)
             (let ((s5-4 (new-stack-vector0)))
-              (vector<-cspace! s5-4 (-> self node-list data 25))
+              (vector<-cspace! s5-4 (joint-node-index happy-plant-lod0-jg fuelcell))
               (send-event gp-3 'trans s5-4)
               )
             )
@@ -929,19 +925,19 @@
       )
     )
   :code (behavior ((arg0 symbol))
-    (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! rolling-start-break-whole-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
       )
     (lods-assign! (-> self draw) (-> self broken-look))
-    (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! rolling-start-break-broken-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
       )
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! rolling-start-broken-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
@@ -970,7 +966,7 @@
   :code (behavior ()
     (lods-assign! (-> self draw) (-> self whole-look))
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! rolling-start-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))

test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc

@@ -6,7 +6,7 @@
   :trans hide-hud-quick
   :code (behavior ((arg0 handle) (arg1 float) (arg2 float))
     (logclear! (-> self mask) (process-mask actor-pause))
-    (ja :group! (-> self draw art-group data 2))
+    (ja :group! fuel-cell-idle-ja)
     (if *target*
         (process-grab? *target*)
         )
@@ -402,7 +402,7 @@
           )
         )
       (when gp-0
-        (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0)
+        (ja-no-eval :group! robber-death-ja :num! (seek!) :frame-num 0.0)
         (until (ja-done? 0)
           (robber-calc-speed 4096.0 8192.0 122880.0 122880.0 #f)
           (robber-move)
@@ -439,9 +439,9 @@
         )
     )
   :code (behavior ()
-    (when (not (ja-group? (-> self draw art-group data 7)))
+    (when (not (ja-group? robber-fly-ja))
       (ja-channel-push! 1 (seconds 0.2))
-      (ja :group! (-> self draw art-group data 7))
+      (ja :group! robber-fly-ja)
       )
     (loop
       (ja :num! (loop! (robber-calc-anim-speed)))
@@ -475,9 +475,9 @@
     )
   :code (behavior ()
     (loop
-      (when (not (ja-group? (-> self draw art-group data 7)))
+      (when (not (ja-group? robber-fly-ja))
         (ja-channel-push! 1 (seconds 0.2))
-        (ja :group! (-> self draw art-group data 7))
+        (ja :group! robber-fly-ja)
         )
       (ja :num! (loop! (robber-calc-anim-speed)))
       (robber-calc-speed 32768.0 122880.0 122060.8 20480.0 #f)
@@ -486,7 +486,7 @@
       (suspend)
       (when (time-elapsed? (-> self last-ambient-time) (-> self time-to-next-ambient))
         (ja-channel-push! 1 (seconds 0.2))
-        (ja-no-eval :group! (-> self draw art-group data 11) :num! (seek!) :frame-num 0.0)
+        (ja-no-eval :group! robber-ambient-look-ja :num! (seek!) :frame-num 0.0)
         (until (ja-done? 0)
           (robber-calc-speed 32768.0 122880.0 122060.8 20480.0 #f)
           (robber-move)
@@ -543,9 +543,9 @@
     )
   :code (behavior ()
     (loop
-      (when (not (ja-group? (-> self draw art-group data 7)))
+      (when (not (ja-group? robber-fly-ja))
         (ja-channel-push! 1 (seconds 0.2))
-        (ja :group! (-> self draw art-group data 7))
+        (ja :group! robber-fly-ja)
         )
       (ja :num! (loop! (robber-calc-anim-speed)))
       (robber-calc-speed 61440.0 122880.0 204800.0 16384.0 #t)
@@ -554,7 +554,7 @@
       (suspend)
       (when (time-elapsed? (-> self last-ambient-time) (-> self time-to-next-ambient))
         (ja-channel-push! 1 (seconds 0.2))
-        (ja-no-eval :group! (-> self draw art-group data 11) :num! (seek!) :frame-num 0.0)
+        (ja-no-eval :group! robber-ambient-look-ja :num! (seek!) :frame-num 0.0)
         (until (ja-done? 0)
           (robber-calc-speed 61440.0 122880.0 204800.0 16384.0 #t)
           (robber-move)
@@ -597,7 +597,7 @@
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.2))
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! robber-idle-hover-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
@@ -637,7 +637,7 @@
       )
     (ja-channel-push! 1 (seconds 0.2))
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek! max 2.0) :frame-num 0.0)
+      (ja-no-eval :group! robber-spots-ja :num! (seek! max 2.0) :frame-num 0.0)
       (until (ja-done? 0)
         (robber-calc-speed 61440.0 122880.0 2048.0 2048.0 #t)
         (robber-rotate (the-as target #f) 1820.4445)
@@ -667,7 +667,7 @@
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.2))
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! robber-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))

test/decompiler/reference/jak1/levels/snow/ice-cube_REF.gc

@@ -871,9 +871,9 @@
   :event ice-cube-default-event-handler
   :code (behavior ()
     (let ((gp-0 (new 'stack-no-clear 'vector)))
-      (vector<-cspace! gp-0 (-> self node-list data 29))
+      (vector<-cspace! gp-0 (joint-node-index ice-cube-lod0-jg Rball))
       (spawn (-> self part4) gp-0)
-      (vector<-cspace! gp-0 (-> self node-list data 25))
+      (vector<-cspace! gp-0 (joint-node-index ice-cube-lod0-jg Lball))
       (spawn (-> self part4) gp-0)
       )
     (ja-channel-push! 1 (seconds 0.1))
@@ -1019,9 +1019,9 @@
       )
     (label cfg-26)
     (let ((gp-1 (new 'stack-no-clear 'vector)))
-      (vector<-cspace! gp-1 (-> self node-list data 29))
+      (vector<-cspace! gp-1 (joint-node-index ice-cube-lod0-jg Rball))
       (spawn (-> self part4) gp-1)
-      (vector<-cspace! gp-1 (-> self node-list data 25))
+      (vector<-cspace! gp-1 (joint-node-index ice-cube-lod0-jg Lball))
       (spawn (-> self part4) gp-1)
       )
     (ja-no-eval :group! ice-cube-appear-land-ja :num! (seek!) :frame-num 0.0)
@@ -1156,9 +1156,9 @@
       )
     (label cfg-26)
     (let ((gp-1 (new 'stack-no-clear 'vector)))
-      (vector<-cspace! gp-1 (-> self node-list data 29))
+      (vector<-cspace! gp-1 (joint-node-index ice-cube-lod0-jg Rball))
       (spawn (-> self part4) gp-1)
-      (vector<-cspace! gp-1 (-> self node-list data 25))
+      (vector<-cspace! gp-1 (joint-node-index ice-cube-lod0-jg Lball))
       (spawn (-> self part4) gp-1)
       )
     (ja-no-eval :group! ice-cube-turn-on-player-land-ja :num! (seek!) :frame-num 0.0)
@@ -1269,9 +1269,9 @@
           )
       (when (zero? (nav-enemy-rnd-int-count 45))
         (let ((gp-3 (new 'stack-no-clear 'vector)))
-          (vector<-cspace! gp-3 (-> self node-list data 29))
+          (vector<-cspace! gp-3 (joint-node-index ice-cube-lod0-jg Rball))
           (spawn (-> self part4) gp-3)
-          (vector<-cspace! gp-3 (-> self node-list data 25))
+          (vector<-cspace! gp-3 (joint-node-index ice-cube-lod0-jg Lball))
           (spawn (-> self part4) gp-3)
           )
         )
@@ -1408,7 +1408,7 @@
   :code (behavior ()
     (logclear! (-> self mask) (process-mask actor-pause))
     (let ((gp-0 (new 'stack-no-clear 'vector)))
-      (vector<-cspace! gp-0 (-> self node-list data 3))
+      (vector<-cspace! gp-0 (joint-node-index ice-cube-lod0-jg main))
       (spawn (-> self part3) gp-0)
       )
     (drop-pickup (-> self enemy-info) #t *entity-pool* (-> self enemy-info) 0)

test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc

@@ -285,7 +285,7 @@
       )
     )
   :code (behavior ()
-    (ja :group! (-> self draw art-group data 2) :num! min)
+    (ja :group! snow-button-going-down-ja :num! min)
     (transform-post)
     (logior! (-> self mask) (process-mask sleep-code))
     (suspend)
@@ -339,7 +339,7 @@
     )
   :code (behavior ()
     (sound-play "prec-button1" :pitch -1)
-    (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! snow-button-going-down-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -373,7 +373,7 @@
     (until (time-elapsed? (-> self state-time) (seconds 0.6))
       (suspend)
       )
-    (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! snow-button-going-up-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))

test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc

@@ -39,17 +39,17 @@
     (let ((v1-0 (-> self seq)))
       (cond
         ((zero? v1-0)
-         (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! max 0.2) :frame-num 0.0)
+         (ja-no-eval :group! snowcam-gearstart-ja :num! (seek! max 0.2) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek! max 0.2))
            )
-         (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.25) :frame-num 0.0)
+         (ja-no-eval :group! snowcam-gate-ja :num! (seek! max 0.25) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek! max 0.25))
            )
-         (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! snowcam-gearend-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
@@ -91,13 +91,13 @@
            )
          )
         ((= v1-0 2)
-         (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! snowcam-eggtop-activating-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
          (send-event (handle->process (-> self notify-handle)) 'notify 'cut)
-         (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! snowcam-ecovent-activating-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
@@ -325,7 +325,7 @@
     )
   :code (behavior ()
     (ja-channel-push! 1 0)
-    (ja :group! (-> self draw art-group data 2) :num! min)
+    (ja :group! snow-eggtop-idle-ja :num! min)
     (transform-post)
     (loop
       (logior! (-> self mask) (process-mask sleep-code))
@@ -398,7 +398,7 @@
       )
     (change-sound! (-> self sound) (static-sound-name "snw-eggtop-seq"))
     (save-reminder (get-task-control (-> self entity extra perm task)) 2 4)
-    (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! snow-eggtop-idle-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (if (-> self play-sound?)
           (update! (-> self sound))
@@ -447,7 +447,7 @@
           )
       )
     (ja-channel-push! 1 0)
-    (ja :group! (-> self draw art-group data 2) :num! max)
+    (ja :group! snow-eggtop-idle-ja :num! max)
     (transform-post)
     (logior! (-> self mask) (process-mask sleep-code))
     (suspend)
@@ -996,7 +996,7 @@
       )
     )
   :code (behavior ()
-    (ja :group! (-> self draw art-group data 2) :num! min)
+    (ja :group! snow-fort-gate-idle-ja :num! min)
     (set! (-> self root-override trans quad) (-> self closed-trans quad))
     (transform-post)
     (suspend)
@@ -1064,7 +1064,7 @@
 ;; failed to figure out what this is:
 (defstate snow-fort-gate-idle-open (snow-fort-gate)
   :code (behavior ()
-    (ja :group! (-> self draw art-group data 2) :num! min)
+    (ja :group! snow-fort-gate-idle-ja :num! min)
     (set! (-> self root-override trans quad) (-> self open-trans quad))
     (transform-post)
     (suspend)
@@ -1278,7 +1278,7 @@
       )
     )
   :code (behavior ()
-    (ja :group! (-> self draw art-group data 2) :num! min)
+    (ja :group! snow-gears-idle-ja :num! min)
     (ja-post)
     (loop
       (logior! (-> self mask) (process-mask sleep-code))
@@ -1294,19 +1294,19 @@
     )
   :code (behavior ()
     (sound-play "eng-start-up")
-    (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.85) :frame-num 0.0)
+    (ja-no-eval :group! snow-gears-start-ja :num! (seek! max 0.85) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek! max 0.85))
       )
-    (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek! max 0.35) :frame-num 0.0)
+    (ja-no-eval :group! snow-gears-loop-ja :num! (seek! max 0.35) :frame-num 0.0)
     (until (ja-done? 0)
       (update! (-> self sound))
       (suspend)
       (ja :num! (seek! max 0.35))
       )
     (set-time! (-> self state-time))
-    (ja :group! (-> self draw art-group data 2) :num! min)
+    (ja :group! snow-gears-idle-ja :num! min)
     (until (time-elapsed? (-> self state-time) (seconds 2))
       (update! (-> self sound))
       (suspend)
@@ -1325,7 +1325,7 @@
     (snow-gears-method-20 self)
     )
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek! max 0.35) :frame-num 0.0)
+    (ja-no-eval :group! snow-gears-loop-ja :num! (seek! max 0.35) :frame-num 0.0)
     (until (ja-done? 0)
       (update! (-> self sound))
       (suspend)
@@ -1333,7 +1333,7 @@
       )
     (stop! (-> self sound))
     (sound-play "eng-shut-down")
-    (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek! max 0.85) :frame-num 0.0)
+    (ja-no-eval :group! snow-gears-stop-ja :num! (seek! max 0.85) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek! max 0.85))
@@ -1682,7 +1682,7 @@
     )
   :code (behavior ()
     (ja-channel-push! 1 0)
-    (ja :group! (-> self draw art-group data 2) :num! min)
+    (ja :group! snow-log-activate-ja :num! min)
     (transform-post)
     (logior! (-> self mask) (process-mask sleep-code))
     (suspend)
@@ -1706,7 +1706,7 @@
     (activate! *camera-smush-control* 819.2 37 150 1.0 0.99)
     (ja-channel-push! 1 0)
     (let ((gp-0 #f))
-      (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! snow-log-activate-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (when (and (not gp-0) (>= (ja-frame-num 0) 5.0))
           (set! gp-0 #t)
@@ -1734,7 +1734,7 @@
           (s5-0 #t)
           )
       (loop
-        (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.25) :frame-num 0.0)
+        (ja-no-eval :group! snow-log-active-loop-ja :num! (seek! max 0.25) :frame-num 0.0)
         (until (ja-done? 0)
           (let ((f0-4 (ja-aframe-num 0)))
             (cond

test/decompiler/reference/jak1/levels/snow/snow-ram-boss_REF.gc

@@ -1439,7 +1439,7 @@
     )
   :code (behavior ((arg0 basic))
     (ja-channel-push! 1 (seconds 0.8))
-    (ja-no-eval :group! (-> self draw art-group data 16) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! ram-boss-dismount-start-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (let ((gp-0 (new 'stack-no-clear 'vector)))
         (vector-! gp-0 (target-pos 0) (-> self collide-info trans))
@@ -1462,7 +1462,7 @@
   :code (behavior ()
     (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2))
     (activate! *camera-smush-control* 409.6 37 150 1.0 0.99)
-    (ja-no-eval :group! (-> self draw art-group data 17) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! ram-boss-dismount-hit-ground-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -1721,31 +1721,31 @@
           ((< 5461.3335 (-> self last-turn-speed))
            (cond
              ((-> self has-shield?)
-              (when (not (ja-group? (-> self draw art-group data 7)))
+              (when (not (ja-group? ram-boss-forward-defend-tracking-ja))
                 (ja-channel-push! 2 (seconds 0.2))
-                (ja :group! (-> self draw art-group data 7) :num! min)
-                (ja :chan 1 :group! (-> self draw art-group data 22) :num! (chan 0) :frame-interp f30-0)
+                (ja :group! ram-boss-forward-defend-tracking-ja :num! min)
+                (ja :chan 1 :group! ram-boss-up-defend-tracking-ja :num! (chan 0) :frame-interp f30-0)
                 )
               )
              (else
-               (when (not (ja-group? (-> self draw art-group data 20)))
+               (when (not (ja-group? ram-boss-forward-defend-tracking-no-shield-ja))
                  (ja-channel-push! 1 (seconds 0.2))
-                 (ja :group! (-> self draw art-group data 20) :num! min)
+                 (ja :group! ram-boss-forward-defend-tracking-no-shield-ja :num! min)
                  )
                )
              )
            )
           ((-> self has-shield?)
-           (when (not (ja-group? (-> self draw art-group data 6)))
+           (when (not (ja-group? ram-boss-forward-defend-ja))
              (ja-channel-push! 2 (seconds 0.2))
-             (ja :group! (-> self draw art-group data 6) :num! min)
-             (ja :chan 1 :group! (-> self draw art-group data 21) :num! (chan 0) :frame-interp f30-0)
+             (ja :group! ram-boss-forward-defend-ja :num! min)
+             (ja :chan 1 :group! ram-boss-up-defend-ja :num! (chan 0) :frame-interp f30-0)
              )
            )
           (else
-            (when (not (ja-group? (-> self draw art-group data 24)))
+            (when (not (ja-group? ram-boss-forward-defend-no-shield-ja))
               (ja-channel-push! 1 (seconds 0.2))
-              (ja :group! (-> self draw art-group data 24) :num! min)
+              (ja :group! ram-boss-forward-defend-no-shield-ja :num! min)
               )
             )
           )
@@ -1772,7 +1772,7 @@
     )
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! ram-boss-forward-defend-block-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -1794,7 +1794,7 @@
     )
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! ram-boss-up-defend-block-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -1867,14 +1867,14 @@
     (ja-channel-push! 1 (seconds 0.075))
     (cond
       ((-> self has-shield?)
-       (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek!) :frame-num 0.0)
+       (ja-no-eval :group! ram-boss-throw-ja :num! (seek!) :frame-num 0.0)
        (until (ja-done? 0)
          (suspend)
          (ja :num! (seek!))
          )
        )
       (else
-        (ja-no-eval :group! (-> self draw art-group data 23) :num! (seek!) :frame-num 0.0)
+        (ja-no-eval :group! ram-boss-throw-no-shield-ja :num! (seek!) :frame-num 0.0)
         (until (ja-done? 0)
           (suspend)
           (ja :num! (seek!))
@@ -1913,10 +1913,10 @@
       (set! (-> self nav target-pos quad) (-> gp-0 quad))
       )
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 18) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! ram-boss-lose-shield-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (let ((gp-1 (new 'stack-no-clear 'vector)))
-        (vector<-cspace! gp-1 (-> self node-list data 32))
+        (vector<-cspace! gp-1 (joint-node-index ram-boss-lod0-jg shield))
         (spawn (-> self part) gp-1)
         )
       (suspend)

test/decompiler/reference/jak1/levels/snow/target-ice_REF.gc

@@ -53,27 +53,27 @@
     (let ((gp-0 60))
       (let ((v1-2 (ja-group)))
         (cond
-          ((or (= v1-2 (-> self draw art-group data 34)) (= v1-2 (-> self draw art-group data 38)))
+          ((or (= v1-2 eichar-jump-ja) (= v1-2 eichar-jump-loop-ja))
            (set! gp-0 21)
            )
-          ((ja-group? (-> self draw art-group data 71))
-           (ja-no-eval :group! (-> self draw art-group data 72) :num! (seek!) :frame-num 0.0)
+          ((ja-group? eichar-wheel-flip-ja)
+           (ja-no-eval :group! eichar-wheel-flip-land-ja :num! (seek!) :frame-num 0.0)
            (until (ja-done? 0)
              (suspend)
              (ja :num! (seek!))
              )
            )
-          ((ja-group? (-> self draw art-group data 51))
+          ((ja-group? eichar-attack-from-stance-ja)
            (cond
              ((rand-vu-percent? 0.3)
-              (ja-no-eval :group! (-> self draw art-group data 53) :num! (seek!) :frame-num 0.0)
+              (ja-no-eval :group! eichar-attack-from-stance-alt-end-ja :num! (seek!) :frame-num 0.0)
               (until (ja-done? 0)
                 (suspend)
                 (ja :num! (seek!))
                 )
               )
              (else
-               (ja-no-eval :group! (-> self draw art-group data 52) :num! (seek!) :frame-num 0.0)
+               (ja-no-eval :group! eichar-attack-from-stance-end-ja :num! (seek!) :frame-num 0.0)
                (until (ja-done? 0)
                  (suspend)
                  (ja :num! (seek!))
@@ -81,27 +81,27 @@
                )
              )
            )
-          ((ja-group? (-> self draw art-group data 78))
-           (ja-no-eval :group! (-> self draw art-group data 79) :num! (seek!) :frame-num 0.0)
+          ((ja-group? eichar-smack-surface-ja)
+           (ja-no-eval :group! eichar-smack-surface-end-ja :num! (seek!) :frame-num 0.0)
            (until (ja-done? 0)
              (suspend)
              (ja :num! (seek!))
              )
            )
-          ((ja-group? (-> self draw art-group data 84))
-           (ja-no-eval :group! (-> self draw art-group data 85) :num! (seek!) :frame-num 0.0)
+          ((ja-group? eichar-yellow-running-blast-ja)
+           (ja-no-eval :group! eichar-yellow-running-blast-end-ja :num! (seek!) :frame-num 0.0)
            (until (ja-done? 0)
              (suspend)
              (ja :num! (seek!))
              )
            (set! gp-0 0)
            )
-          ((ja-group? (-> self draw art-group data 59))
+          ((ja-group? eichar-attack-punch-ja)
            (set! (-> self control unknown-float81) (-> self control unknown-float80))
            (set! (-> self control unknown-surface00) *walk-no-turn-mods*)
            (ja-no-eval :group! (if (rand-vu-percent? 0.3)
-                                  (-> self draw art-group data 61)
-                                  (-> self draw art-group data 60)
+                                  eichar-attack-punch-alt-end-ja
+                                  eichar-attack-punch-end-ja
                                   )
                        :num! (seek!)
                        :frame-num 0.0
@@ -116,10 +116,10 @@
            (rot->dir-targ! (-> self control))
            )
           ((let ((v1-188 (ja-group)))
-             (or (= v1-188 (-> self draw art-group data 31)) (= v1-188 (-> self draw art-group data 32)))
+             (or (= v1-188 eichar-duck-stance-ja) (= v1-188 eichar-duck-walk-ja))
              )
            (ja-channel-push! 1 (seconds 0.04))
-           (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek! 0.0 1.2) :frame-num max)
+           (ja-no-eval :group! eichar-stance-to-duck-ja :num! (seek! 0.0 1.2) :frame-num max)
            (until (ja-done? 0)
              (suspend)
              (ja :num! (seek! 0.0 1.2))
@@ -130,20 +130,20 @@
         )
       (while (< 16384.0 (-> self control unknown-float01))
         (cond
-          ((ja-group? (-> self draw art-group data 103))
+          ((ja-group? eichar-ice-slide-ja)
            )
           (else
             (ja-channel-push! 1 (the-as time-frame gp-0))
             (set! gp-0 150)
-            (ja :group! (-> self draw art-group data 103))
+            (ja :group! eichar-ice-slide-ja)
             )
           )
         (suspend)
         (ja :num! (loop!))
         )
-      (when (not (ja-group? (-> self draw art-group data 104)))
+      (when (not (ja-group? eichar-ice-stance-ja))
         (ja-channel-push! 1 (the-as time-frame gp-0))
-        (ja :group! (-> self draw art-group data 104))
+        (ja :group! eichar-ice-stance-ja)
         )
       )
     (loop
@@ -192,7 +192,7 @@
     (when (and (not (move-legs?)) (let ((gp-0 (ja-group))
                                         (f0-1 (ja-aframe-num 0))
                                         )
-                                    (if (and (= gp-0 (-> self draw art-group data 102)) (>= f0-1 30.0) (>= 35.0 f0-1))
+                                    (if (and (= gp-0 eichar-ice-skate-ja) (>= f0-1 30.0) (>= 35.0 f0-1))
                                         #t
                                         )
                                     )
@@ -231,18 +231,18 @@
     )
   :code (behavior ()
     (cond
-      ((ja-group? (-> self draw art-group data 23))
+      ((ja-group? eichar-walk-ja)
        (let ((f30-0 (ja-aframe-num 0)))
          (ja-channel-push! 1 (seconds 0.1))
-         (ja :group! (-> self draw art-group data 102) :num! (identity f30-0))
+         (ja :group! eichar-ice-skate-ja :num! (identity f30-0))
          )
        )
-      ((ja-group? (-> self draw art-group data 102))
+      ((ja-group? eichar-ice-skate-ja)
        )
       (else
         (let ((v1-18 (ja-group)))
           (cond
-            ((or (= v1-18 (-> self draw art-group data 60)) (= v1-18 (-> self draw art-group data 61)))
+            ((or (= v1-18 eichar-attack-punch-end-ja) (= v1-18 eichar-attack-punch-alt-end-ja))
              (set! (-> self control unknown-float81) (-> self control unknown-float80))
              (set! (-> self control unknown-surface00) *walk-no-turn-mods*)
              (while (< (ja-aframe-num 0) 42.0)
@@ -252,15 +252,15 @@
              (set! (-> self control unknown-surface00) *walk-mods*)
              (set! (-> self control unknown-float81) 0.0)
              (ja-channel-push! 1 (seconds 0.1))
-             (ja :group! (-> self draw art-group data 102) :num! (identity (ja-aframe 34.0 0)))
+             (ja :group! eichar-ice-skate-ja :num! (identity (ja-aframe 34.0 0)))
              (while (!= (-> self skel root-channel 0) (-> self skel channel))
                (suspend)
                )
              )
-            ((ja-group? (-> self draw art-group data 59))
+            ((ja-group? eichar-attack-punch-ja)
              (set! (-> self control unknown-float81) (-> self control unknown-float80))
              (set! (-> self control unknown-surface00) *walk-no-turn-mods*)
-             (ja-no-eval :group! (-> self draw art-group data 60) :num! (seek! (ja-aframe 42.0 0)) :frame-num 0.0)
+             (ja-no-eval :group! eichar-attack-punch-end-ja :num! (seek! (ja-aframe 42.0 0)) :frame-num 0.0)
              (until (ja-done? 0)
                (suspend)
                (ja :num! (seek! (ja-aframe 42.0 0)))
@@ -268,14 +268,14 @@
              (set! (-> self control unknown-surface00) *walk-mods*)
              (set! (-> self control unknown-float81) 0.0)
              (ja-channel-push! 1 (seconds 0.1))
-             (ja :group! (-> self draw art-group data 102) :num! (identity (ja-aframe 34.0 0)))
+             (ja :group! eichar-ice-skate-ja :num! (identity (ja-aframe 34.0 0)))
              (while (!= (-> self skel root-channel 0) (-> self skel channel))
                (suspend)
                )
              )
             (else
               (ja-channel-push! 1 (seconds 0.05))
-              (ja :group! (-> self draw art-group data 102))
+              (ja :group! eichar-ice-skate-ja)
               )
             )
           )

test/decompiler/reference/jak1/levels/snow/target-snowball_REF.gc

@@ -115,7 +115,7 @@
     (move-by-vector! (-> self control) (new 'static 'vector :y 4096.0 :w 1.0))
     (logior! (-> self control root-prim prim-core action) (collide-action snowball))
     (ja-channel-set! 1)
-    (ja :group! (-> self draw art-group data 5) :num! min)
+    (ja :group! eichar-stance-loop-ja :num! min)
     (remove-exit)
     (go target-snowball)
     )

test/decompiler/reference/jak1/levels/sunken/double-lurker_REF.gc

@@ -299,7 +299,7 @@
   :code (behavior ()
     (logclear! (-> self mask) (process-mask actor-pause))
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! double-lurker-bottom-take-hit-ja :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! double-lurker-top-on-shoulders-die-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -335,7 +335,7 @@
     (let ((gp-0 (new 'stack-no-clear 'vector)))
       (set! (-> gp-0 quad) (-> self collide-info trans quad))
       (ja-channel-push! 1 (seconds 0.1))
-      (ja-no-eval :group! double-lurker-both-break-apart-ja :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! double-lurker-top-both-break-apart-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (vector-lerp!
           (-> self collide-info trans)
@@ -518,7 +518,7 @@
   (cond
     (arg2
       (ja-channel-set! 1)
-      (ja :group! double-lurker-both-idle-ja :num! min)
+      (ja :group! double-lurker-top-both-idle-ja :num! min)
       (transform-post)
       (let ((v1-13 (-> self draw shadow-ctrl)))
         (logior! (-> v1-13 settings flags) (shadow-flags disable-draw))
@@ -528,7 +528,7 @@
       )
     (else
       (ja-channel-set! 1)
-      (ja :group! double-lurker-idle-ja :num! min)
+      (ja :group! double-lurker-top-idle-ja :num! min)
       (transform-post)
       (move-to-ground (-> self collide-info) 40960.0 40960.0 #t (collide-kind background))
       (nav-enemy-method-51 self)

test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc

@@ -189,7 +189,7 @@
 ;; failed to figure out what this is:
 (defstate helix-slide-door-close (helix-slide-door)
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! helix-slide-door-idle-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))

test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc

@@ -286,7 +286,7 @@
   (set! (-> self part2) (create-launch-control (-> *part-group-id-table* 107) self))
   (initialize-skeleton self *orbit-plat-bottom-sg* '())
   (ja-channel-set! 1)
-  (ja :group! orbit-plat-idle-ja :num! min)
+  (ja :group! orbit-plat-bottom-idle-ja :num! min)
   (go orbit-plat-bottom-idle)
   (none)
   )

test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc

@@ -350,7 +350,7 @@
   (set! (-> self rest-pos quad) (-> self root trans quad))
   (initialize-skeleton self *blue-eco-charger-orb-sg* '())
   (ja-channel-set! 1)
-  (ja :group! (-> self draw art-group data 2) :num! min)
+  (ja :group! blue-eco-charger-orb-idle-ja :num! min)
   (set-vector! (-> self orbit-rot) 0.0 0.0 0.0 1.0)
   (go blue-eco-charger-orb-idle)
   (none)
@@ -399,7 +399,7 @@
   :code (behavior ()
     (set! (-> self open-level) 0.0)
     (ja-channel-set! 1)
-    (ja :group! (-> self draw art-group data 2) :num! min)
+    (ja :group! blue-eco-charger-open-ja :num! min)
     (loop
       (when (logtest? (-> self draw status) (draw-status was-drawn))
         (if (and (and *target* (>= 16384.0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans))))
@@ -859,7 +859,7 @@
     (suspend)
     (set-time! (-> self state-time))
     (let ((gp-1 #f))
-      (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! exit-chamber-start-door-shut-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (when (and (not gp-1) (time-elapsed? (-> self state-time) (seconds 0.75)) (-> self door))
           (set! gp-1 #t)
@@ -870,13 +870,13 @@
         )
       )
     (set! (-> self move-player?) #t)
-    (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! exit-chamber-start-in-room-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
       )
     (load-state-want-levels 'sunken 'village2)
-    (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! exit-chamber-middle-in-water-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (exit-chamber-method-24 self 51200.0)
       (update-trans! (-> self sound) (-> self last-pos))
@@ -888,7 +888,7 @@
     (load-state-want-display-level 'village2 'display)
     (load-state-want-display-level 'sunken 'special)
     (let ((gp-2 #f))
-      (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! exit-chamber-end-out-of-water-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (seek! (-> self wave-scale) 1.0 0.0016666667)
         (exit-chamber-method-20 self (-> self wave-scale))
@@ -1063,7 +1063,7 @@
     (let ((gp-1 #f)
           (s5-0 #f)
           )
-      (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! exit-chamber-dive-start-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (when (and (not gp-1) (time-elapsed? (-> self state-time) (seconds 0.25)) (-> self door))
           (set! gp-1 #t)
@@ -1087,7 +1087,7 @@
       )
     (load-state-want-levels 'sunken 'sunkenb)
     (kill-and-free-particles (-> self part))
-    (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! exit-chamber-dive-middle-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (exit-chamber-method-24 self 47104.0)
       (update-trans! (-> self sound) (-> self last-pos))
@@ -1098,7 +1098,7 @@
     (stop! (-> self sound))
     (load-state-want-display-level 'sunkenb 'display)
     (load-state-want-vis 'sub)
-    (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! exit-chamber-dive-end-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))

test/decompiler/reference/jak1/levels/sunken/sunken-fish_REF.gc

@@ -227,7 +227,7 @@
     )
   :code (behavior ()
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! sunkenfisha-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))

test/decompiler/reference/jak1/levels/sunken/sunken-obs_REF.gc

@@ -222,12 +222,12 @@
     (let ((v1-0 (-> self seq)))
       (cond
         ((zero? v1-0)
-         (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! sunkencam-start-door-shut-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
-         (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! sunkencam-start-in-room-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
@@ -237,14 +237,14 @@
            (set! (-> v1-45 color) (new 'static 'rgba :g #x20 :b #x40 :a #x50))
            )
          (set-blackout-frames (seconds 0.1))
-         (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! sunkencam-middle-in-water-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
          (set-blackout-frames (seconds 0.5))
          (let ((gp-0 2))
-           (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0)
+           (ja-no-eval :group! sunkencam-end-out-of-water-ja :num! (seek!) :frame-num 0.0)
            (until (ja-done? 0)
              (+! gp-0 -1)
              (if (zero? gp-0)
@@ -257,7 +257,7 @@
          (set-blackout-frames (seconds 0.1))
          )
         ((= v1-0 1)
-         (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! sunkencam-dive-start-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
@@ -267,14 +267,14 @@
            (set! (-> v1-116 color) (new 'static 'rgba :g #x20 :b #x40 :a #x50))
            )
          (set-blackout-frames (seconds 0.1))
-         (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! sunkencam-dive-middle-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
          (set-blackout-frames (seconds 0.1))
          (let ((gp-1 2))
-           (ja-no-eval :group! (-> self draw art-group data 11) :num! (seek!) :frame-num 0.0)
+           (ja-no-eval :group! sunkencam-dive-end-ja :num! (seek!) :frame-num 0.0)
            (until (ja-done? 0)
              (+! gp-1 -1)
              (if (zero? gp-1)
@@ -295,18 +295,18 @@
            )
          )
         ((= v1-0 2)
-         (ja-no-eval :group! (-> self draw art-group data 16) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! sunkencam-helix-hit-switch-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
-         (ja-no-eval :group! (-> self draw art-group data 17) :num! (seek! max 0.67) :frame-num 0.0)
+         (ja-no-eval :group! sunkencam-helix-door-shuts-ja :num! (seek! max 0.67) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek! max 0.67))
            )
          (pov-camera-play-and-reposition
-           (the-as art-joint-anim (-> self draw art-group data 18))
+           (the-as art-joint-anim sunkencam-helix-show-rising-water-ja)
            (new 'static 'vector :x 2449408.0 :y -1822720.0 :z -7299072.0)
            0.67
            )
@@ -314,7 +314,7 @@
         ((= v1-0 3)
          (ambient-hint-spawn "gamcam34" (the-as vector #f) *entity-pool* 'camera)
          (pov-camera-play-and-reposition
-           (the-as art-joint-anim (-> self draw art-group data 12))
+           (the-as art-joint-anim sunkencam-square-platform-setup1-rise1-ja)
            (new 'static 'vector :x 2707456.0 :y -630784.0 :z -6635520.0)
            1.0
            )
@@ -322,7 +322,7 @@
         ((= v1-0 4)
          (ambient-hint-spawn "gamcam35" (the-as vector #f) *entity-pool* 'camera)
          (pov-camera-play-and-reposition
-           (the-as art-joint-anim (-> self draw art-group data 13))
+           (the-as art-joint-anim sunkencam-square-platform-setup1-rise2-ja)
            (new 'static 'vector :x 2834432.0 :y -634880.0 :z -6811648.0)
            1.3
            )
@@ -334,7 +334,7 @@
         ((= v1-0 5)
          (ambient-hint-spawn "gamcam37" (the-as vector #f) *entity-pool* 'camera)
          (pov-camera-play-and-reposition
-           (the-as art-joint-anim (-> self draw art-group data 14))
+           (the-as art-joint-anim sunkencam-square-platform-setup2-rise1-ja)
            (new 'static 'vector :x 2695168.0 :y -544768.0 :z -7077888.0)
            1.0
            )
@@ -342,7 +342,7 @@
         ((= v1-0 6)
          (ambient-hint-spawn "gamcam36" (the-as vector #f) *entity-pool* 'camera)
          (pov-camera-play-and-reposition
-           (the-as art-joint-anim (-> self draw art-group data 15))
+           (the-as art-joint-anim sunkencam-square-platform-setup2-rise2-ja)
            (new 'static 'vector :x 2482176.0 :y -516096.0 :z -6922240.0)
            1.0
            )
@@ -394,7 +394,7 @@
       (ja-eval)
       )
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! max (-> self anim-speed)) :frame-num 0.0)
+      (ja-no-eval :group! seaweed-idle-ja :num! (seek! max (-> self anim-speed)) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! max (-> self anim-speed)))

test/decompiler/reference/jak1/levels/sunken/target-tube_REF.gc

@@ -618,7 +618,7 @@
       )
     (set-time-ratios *display* (the float gp-0))
     )
-  (ja :group! (-> self draw art-group data 105) :num! (identity (ja-aframe (-> self tube turn-anim-frame) 0)))
+  (ja :group! eichar-tube-turn-ja :num! (identity (ja-aframe (-> self tube turn-anim-frame) 0)))
   0
   (none)
   )
@@ -646,9 +646,9 @@
     )
   :code (behavior ()
     (case (ja-group)
-      (((-> self draw art-group data 41) (-> self draw art-group data 38))
+      ((eichar-duck-high-jump-ja eichar-jump-loop-ja)
        (ja-channel-push! 1 (seconds 0.04))
-       (ja-no-eval :group! (-> self draw art-group data 106) :num! (seek!) :frame-num 0.0)
+       (ja-no-eval :group! eichar-tube-jump-land-ja :num! (seek!) :frame-num 0.0)
        (until (ja-done? 0)
          (suspend)
          (ja :num! (seek!))
@@ -693,7 +693,7 @@
     )
   :code (behavior ((arg0 float) (arg1 float))
     (ja-channel-push! 1 (seconds 0.05))
-    (ja :group! (-> self draw art-group data 41) :num! (identity (ja-aframe 16.0 0)))
+    (ja :group! eichar-duck-high-jump-ja :num! (identity (ja-aframe 16.0 0)))
     (let ((f30-0 35.0)
           (f28-0 1.0)
           )
@@ -716,10 +716,10 @@
         (suspend)
         )
       )
-    (ja-no-eval :group! (-> self draw art-group data 38) :num! (loop!) :frame-num 0.0)
+    (ja-no-eval :group! eichar-jump-loop-ja :num! (loop!) :frame-num 0.0)
     (loop
       (suspend)
-      (ja :group! (-> self draw art-group data 38) :num! (loop!))
+      (ja :group! eichar-jump-loop-ja :num! (loop!))
       )
     )
   :post (-> target-tube post)
@@ -858,7 +858,7 @@
     (set! (-> self control transv quad) (the-as uint128 0))
     (set! (-> self control unknown-surface00) *neutral-mods*)
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 76) :num! (seek! (ja-aframe 134.0 0)) :frame-num 0.0)
+    (ja-no-eval :group! eichar-deatha-ja :num! (seek! (ja-aframe 134.0 0)) :frame-num 0.0)
     (until (ja-done? 0)
       (compute-alignment! (-> self align))
       (let ((gp-2 (new 'stack-no-clear 'vector)))

test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc

@@ -167,19 +167,13 @@
     )
   :trans plat-trans
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 3)
-                :num! (seek! (ja-aframe 60.0 0))
-                :frame-num (ja-aframe 0.0 0)
-                )
+    (ja-no-eval :group! wedge-plat-tip-ja :num! (seek! (ja-aframe 60.0 0)) :frame-num (ja-aframe 0.0 0))
     (until (ja-done? 0)
       (wedge-plat-method-27 self)
       (suspend)
       (ja :num! (seek! (ja-aframe 60.0 0)))
       )
-    (ja-no-eval :group! (-> self draw art-group data 3)
-                :num! (seek! (ja-aframe 100.0 0))
-                :frame-num (ja-aframe 60.0 0)
-                )
+    (ja-no-eval :group! wedge-plat-tip-ja :num! (seek! (ja-aframe 100.0 0)) :frame-num (ja-aframe 60.0 0))
     (until (ja-done? 0)
       (wedge-plat-method-27 self)
       (suspend)
@@ -191,10 +185,7 @@
       (wedge-plat-method-27 self)
       (suspend)
       )
-    (ja-no-eval :group! (-> self draw art-group data 3)
-                :num! (seek! (ja-aframe 153.0 0))
-                :frame-num (ja-aframe 100.0 0)
-                )
+    (ja-no-eval :group! wedge-plat-tip-ja :num! (seek! (ja-aframe 153.0 0)) :frame-num (ja-aframe 100.0 0))
     (until (ja-done? 0)
       (wedge-plat-method-27 self)
       (suspend)
@@ -340,19 +331,13 @@
     )
   :trans plat-trans
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 3)
-                :num! (seek! (ja-aframe 60.0 0))
-                :frame-num (ja-aframe 0.0 0)
-                )
+    (ja-no-eval :group! wedge-plat-outer-tip-ja :num! (seek! (ja-aframe 60.0 0)) :frame-num (ja-aframe 0.0 0))
     (until (ja-done? 0)
       (wedge-plat-method-27 self)
       (suspend)
       (ja :num! (seek! (ja-aframe 60.0 0)))
       )
-    (ja-no-eval :group! (-> self draw art-group data 3)
-                :num! (seek! (ja-aframe 100.0 0))
-                :frame-num (ja-aframe 60.0 0)
-                )
+    (ja-no-eval :group! wedge-plat-outer-tip-ja :num! (seek! (ja-aframe 100.0 0)) :frame-num (ja-aframe 60.0 0))
     (until (ja-done? 0)
       (wedge-plat-method-27 self)
       (suspend)
@@ -364,10 +349,7 @@
       (wedge-plat-method-27 self)
       (suspend)
       )
-    (ja-no-eval :group! (-> self draw art-group data 3)
-                :num! (seek! (ja-aframe 153.0 0))
-                :frame-num (ja-aframe 100.0 0)
-                )
+    (ja-no-eval :group! wedge-plat-outer-tip-ja :num! (seek! (ja-aframe 153.0 0)) :frame-num (ja-aframe 100.0 0))
     (until (ja-done? 0)
       (wedge-plat-method-27 self)
       (suspend)

test/decompiler/reference/jak1/levels/swamp/billy_REF.gc

@@ -209,7 +209,7 @@
     (send-event (handle->process (-> self snack)) 'eat)
     (sound-play "rat-gulp")
     (ja-channel-push! 1 (seconds 0.05))
-    (ja :group! (-> self draw art-group data 12))
+    (ja :group! swamp-rat-eat-ja)
     (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)

test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc

@@ -201,7 +201,7 @@
       (set! (-> gp-0 w) (- (vector-dot gp-0 (-> self root-override trans))))
       (loop
         (set-time! (-> self state-time))
-        (ja :group! (-> self draw art-group data 3))
+        (ja :group! swamp-spike-up-ja)
         (until (>= (get-current-phase (-> self sync)) 0.5)
           (ja :num-func num-func-identity :frame-num 0.0)
           (suspend)
@@ -223,7 +223,7 @@
                 )
               )
             (else
-              (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+              (ja-no-eval :group! swamp-spike-shake-ja :num! (seek!) :frame-num 0.0)
               (until (ja-done? 0)
                 (suspend)
                 (ja :num! (seek!))
@@ -242,7 +242,7 @@
                     )
                   )
               (set! (-> self dangerous) #t)
-              (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+              (ja-no-eval :group! swamp-spike-up-ja :num! (seek!) :frame-num 0.0)
               (until (ja-done? 0)
                 (suspend)
                 (ja :num! (seek!))
@@ -266,7 +266,7 @@
                     :to self
                     )
                   )
-              (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+              (ja-no-eval :group! swamp-spike-down-ja :num! (seek!) :frame-num 0.0)
               (until (ja-done? 0)
                 (suspend)
                 (ja :num! (seek!))
@@ -294,7 +294,7 @@
     )
   :code (behavior ()
     (set-time! (-> self state-time))
-    (ja :group! (-> self draw art-group data 4))
+    (ja :group! swamp-spike-down-ja)
     (until (-> self open-gate)
       (ja :num-func num-func-identity :frame-num 0.0)
       (suspend)
@@ -310,7 +310,7 @@
       (-> self root-override trans)
       :to self
       )
-    (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! swamp-spike-down-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -865,7 +865,7 @@
     )
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.1))
-    (ja :group! (-> self draw art-group data 3))
+    (ja :group! tar-plat-idle-ja)
     (ja :num-func num-func-identity :frame-num 0.0)
     (loop
       (suspend)

test/decompiler/reference/jak1/levels/title/title-obs_REF.gc

@@ -322,7 +322,7 @@
     (send-event (ppointer->process (-> self parent)) 'wait)
     (send-event self 'update)
     (ja-channel-set! 1)
-    (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! logo-logo-intro-2-pre-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (logior! (-> self skel status) (janim-status spool))
       (suspend)
@@ -420,7 +420,7 @@
           )
       (set! *spawn-actors* #f)
       (ja-channel-set! 1)
-      (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! logo-logo-loop-pre-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (logior! (-> self skel status) (janim-status spool))
         (suspend)

test/decompiler/reference/jak1/levels/training/training-obs_REF.gc

@@ -774,7 +774,7 @@
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.12))
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! scarecrow-a-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
@@ -793,21 +793,21 @@
       (ja-channel-push! 1 (seconds 0.07))
       (cond
         ((< (fabs arg0) 8192.0)
-         (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! scarecrow-a-hit-front-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
          )
         ((and (< 8192.0 arg0) (< arg0 24576.0))
-         (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! scarecrow-a-hit-left-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
          )
         (else
-          (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0)
+          (ja-no-eval :group! scarecrow-a-hit-right-ja :num! (seek!) :frame-num 0.0)
           (until (ja-done? 0)
             (suspend)
             (ja :num! (seek!))
@@ -916,7 +916,7 @@
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.12))
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! scarecrow-b-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
@@ -935,21 +935,21 @@
       (ja-channel-push! 1 (seconds 0.07))
       (cond
         ((< (fabs arg0) 8192.0)
-         (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! scarecrow-b-hit-front-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
          )
         ((and (< 8192.0 arg0) (< arg0 24576.0))
-         (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! scarecrow-b-hit-left-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
          )
         (else
-          (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0)
+          (ja-no-eval :group! scarecrow-b-hit-right-ja :num! (seek!) :frame-num 0.0)
           (until (ja-done? 0)
             (suspend)
             (ja :num! (seek!))

test/decompiler/reference/jak1/levels/village1/assistant_REF.gc

@@ -244,13 +244,19 @@
            (countdown (gp-2 (+ (the int (* f30-0 (+ -1.0 (the-as float v1-77)))) 4))
              (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0)
              (until (ja-done? 0)
-               (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 30)))
+               (spawn
+                 (-> self part)
+                 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index assistant-lod0-jg torchTIP))
+                 )
                (suspend)
                (ja :num! (seek!))
                )
              (ja-no-eval :group! (ja-group) :num! (seek! 0.0) :frame-num max)
              (until (ja-done? 0)
-               (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 30)))
+               (spawn
+                 (-> self part)
+                 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index assistant-lod0-jg torchTIP))
+                 )
                (suspend)
                (ja :num! (seek! 0.0))
                )

test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc

@@ -840,7 +840,7 @@
            (f28-0 (+ -1.0 (* 2.0 (-> self engine-sound-envelope))))
            (gp-0 (new 'stack-no-clear 'vector))
            )
-       (vector<-cspace! gp-0 (-> self node-list data 4))
+       (vector<-cspace! gp-0 (joint-node-index fishermans-boat-lod0-jg prop))
        (sound-play
          "boat-engine"
          :id (-> self engine-sound-id)
@@ -1559,7 +1559,7 @@
       (send-event *target* 'blend-shape #f)
       (ja-channel-set! 1)
       (ja :group! fishermans-boat-idle-ja)
-      (vector<-cspace! (-> self root-overlay trans) (-> self node-list data 3))
+      (vector<-cspace! (-> self root-overlay trans) (joint-node-index fishermans-boat-lod0-jg main))
       (matrix->quaternion (-> self root-overlay quat) (-> self node-list data 3 bone transform))
       (fishermans-boat-reset-physics)
       (transform-post)
@@ -1678,7 +1678,7 @@
       (send-event *target* 'blend-shape #f)
       (ja-channel-set! 1)
       (ja :group! fishermans-boat-idle-ja)
-      (vector<-cspace! (-> self root-overlay trans) (-> self node-list data 3))
+      (vector<-cspace! (-> self root-overlay trans) (joint-node-index fishermans-boat-lod0-jg main))
       (matrix->quaternion (-> self root-overlay quat) (-> self node-list data 3 bone transform))
       (fishermans-boat-reset-physics)
       (transform-post)

test/decompiler/reference/jak1/levels/village1/village-obs_REF.gc

@@ -760,7 +760,7 @@
     (set! (-> self rotate-speed) 12743.111)
     (set! (-> self turn-time) (seconds 0.5))
     (loop
-      (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! villa-starfish-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))

test/decompiler/reference/jak1/levels/village2/assistant-village2_REF.gc

@@ -560,13 +560,19 @@
              (countdown (gp-3 (+ (the int (* f30-1 (+ -1.0 (the-as float v1-114)))) 4))
                (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0)
                (until (ja-done? 0)
-                 (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 30)))
+                 (spawn
+                   (-> self part)
+                   (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index assistant-village2-lod0-jg torchTIP))
+                   )
                  (suspend)
                  (ja :num! (seek!))
                  )
                (ja-no-eval :group! (ja-group) :num! (seek! 0.0) :frame-num max)
                (until (ja-done? 0)
-                 (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 30)))
+                 (spawn
+                   (-> self part)
+                   (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index assistant-village2-lod0-jg torchTIP))
+                   )
                  (suspend)
                  (ja :num! (seek! 0.0))
                  )
@@ -574,7 +580,10 @@
              )
            (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0)
            (until (ja-done? 0)
-             (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 30)))
+             (spawn
+               (-> self part)
+               (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index assistant-village2-lod0-jg torchTIP))
+               )
              (suspend)
              (ja :num! (seek!))
              )

test/decompiler/reference/jak1/levels/village2/swamp-blimp_REF.gc

@@ -1383,7 +1383,7 @@
              (v1-11 (the-as number (logior #x3f800000 v1-10)))
              (f30-3 (+ f30-2 (* f28-1 (+ -1.0 (the-as float v1-11)))))
              )
-        (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek! max f30-3) :frame-num 0.0)
+        (ja-no-eval :group! swamp-rope-swing-ja :num! (seek! max f30-3) :frame-num 0.0)
         (until (ja-done? 0)
           (swamp-rope-break-code)
           (suspend)
@@ -1446,7 +1446,7 @@
 (defstate swamp-rope-idle-rock (swamp-rope)
   :trans swamp-rope-trans
   :code (behavior ()
-    (ja :group! swamp-blimp-idle-ja)
+    (ja :group! swamp-rope-slack-ja)
     (loop
       (let* ((f0-1 (* 2000.0 (- (-> self old-scale) (-> self root scale y))))
              (f1-3 (+ 0.5 f0-1))
@@ -1476,7 +1476,7 @@
 (defstate swamp-rope-idle-arm (swamp-rope)
   :trans swamp-rope-trans
   :code (behavior ()
-    (ja :group! swamp-blimp-idle-ja)
+    (ja :group! swamp-rope-slack-ja)
     (loop
       (let* ((a0-3 (-> self other-entity))
              (v1-3 (if a0-3

test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc

@@ -39,14 +39,14 @@
     (let ((v1-0 (-> self seq)))
       (cond
         ((zero? v1-0)
-         (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! village2cam-elevator-at-top-going-down-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
          )
         ((= v1-0 1)
-         (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! village2cam-elevator-at-bottom-going-up-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
@@ -54,7 +54,7 @@
          )
         ((= v1-0 2)
          (pov-camera-play-and-reposition
-           (the-as art-joint-anim (-> self draw art-group data 4))
+           (the-as art-joint-anim village2cam-elevator-at-top-going-up-ja)
            (new 'static 'vector :x 2199552.0 :y 40960.0 :z -6676480.0)
            1.0
            )
@@ -563,12 +563,30 @@
     )
   :trans (behavior ()
     (when (>= (ja-aframe-num 0) 500.0)
-      (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 3)))
-      (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 4)))
-      (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 5)))
-      (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 6)))
-      (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 7)))
-      (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 9)))
+      (spawn
+        (-> self part)
+        (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 1))
+        )
+      (spawn
+        (-> self part)
+        (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 2))
+        )
+      (spawn
+        (-> self part)
+        (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 3))
+        )
+      (spawn
+        (-> self part)
+        (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 4))
+        )
+      (spawn
+        (-> self part)
+        (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 5))
+        )
+      (spawn
+        (-> self part)
+        (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index allpontoons-lod0-jg 6))
+        )
       )
     )
   :code (behavior ((arg0 handle))
@@ -673,7 +691,7 @@
 (defbehavior fireboulder-hover-stuff fireboulder ()
   (local-vars (v0-1 object))
   (let ((gp-0 (new 'stack-no-clear 'vector)))
-    (vector<-cspace! gp-0 (-> self node-list data 4))
+    (vector<-cspace! gp-0 (joint-node-index fireboulder-lod0-jg bouldercenter))
     (cond
       ((handle->process (-> self tracker))
        (let ((v1-6 (-> (the-as (pointer part-tracker) (-> self tracker process)) 0)))
@@ -716,7 +734,7 @@
   :enter (behavior ()
     (fireboulder-disable-blocking-collision)
     (ja-channel-set! 1)
-    (ja :group! (-> self draw art-group data 3))
+    (ja :group! fireboulder-hover-ja)
     (logclear! (-> self draw status) (draw-status hidden))
     (set! (-> self root-override trans quad) (-> self entity extra trans quad))
     (vector-reset! (-> self draw origin))
@@ -724,7 +742,7 @@
     (ja-post)
     (logclear! (-> self skel status) (janim-status inited))
     (let ((gp-0 (new 'stack-no-clear 'vector)))
-      (vector<-cspace! gp-0 (-> self node-list data 4))
+      (vector<-cspace! gp-0 (joint-node-index fireboulder-lod0-jg bouldercenter))
       (vector-! (-> self draw bounds) gp-0 (-> self root-override trans))
       )
     (set! (-> self draw bounds w) 24576.0)
@@ -1545,7 +1563,7 @@
         )
       )
     (ja-channel-push! 1 (seconds 0.2))
-    (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! ogreboss-village2-pre-throw-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -1571,7 +1589,7 @@
         )
       )
     (ja-channel-push! 1 (seconds 0.2))
-    (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! ogreboss-village2-throw-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -1590,7 +1608,7 @@
       (let ((v1-0 (rand-vu-int-range 0 2)))
         (cond
           ((zero? v1-0)
-           (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! (ja-aframe 140.0 0)) :frame-num 0.0)
+           (ja-no-eval :group! ogreboss-village2-idle-ja :num! (seek! (ja-aframe 140.0 0)) :frame-num 0.0)
            (until (ja-done? 0)
              (suspend)
              (ja :num! (seek! (ja-aframe 140.0 0)))
@@ -1600,7 +1618,7 @@
                (suspend)
                )
              )
-           (ja-no-eval :group! (-> self draw art-group data 2)
+           (ja-no-eval :group! ogreboss-village2-idle-ja
                        :num! (seek! (ja-aframe 168.0 0))
                        :frame-num (ja-aframe 140.0 0)
                        )
@@ -1613,14 +1631,14 @@
                (suspend)
                )
              )
-           (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num (ja-aframe 168.0 0))
+           (ja-no-eval :group! ogreboss-village2-idle-ja :num! (seek!) :frame-num (ja-aframe 168.0 0))
            (until (ja-done? 0)
              (suspend)
              (ja :num! (seek!))
              )
            )
           ((= v1-0 1)
-           (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+           (ja-no-eval :group! ogreboss-village2-idle-alt-ja :num! (seek!) :frame-num 0.0)
            (until (ja-done? 0)
              (suspend)
              (ja :num! (seek!))
@@ -1628,7 +1646,7 @@
            )
           (else
             (dotimes (gp-7 4)
-              (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+              (ja-no-eval :group! ogreboss-village2-idle-bored-ja :num! (seek!) :frame-num 0.0)
               (until (ja-done? 0)
                 (suspend)
                 (ja :num! (seek!))
@@ -1641,7 +1659,7 @@
         (cond
           ((< 0.6666667 f0-33)
            (ja-channel-push! 1 (seconds 0.2))
-           (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0)
+           (ja-no-eval :group! ogreboss-village2-victory-ja :num! (seek!) :frame-num 0.0)
            (until (ja-done? 0)
              (suspend)
              (ja :num! (seek!))

test/decompiler/reference/jak1/levels/village3/minecart_REF.gc

@@ -62,7 +62,7 @@
       (ja :num-func num-func-identity
           :frame-num (* (get-current-phase (-> self sync)) (the float (+ (-> (ja-group) data 0 length) -1)))
           )
-      (let ((a1-1 (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 4))))
+      (let ((a1-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index minecartsteel-lod0-jg cart))))
         (update-trans! (-> self sound) a1-1)
         )
       (update! (-> self sound))
@@ -111,7 +111,7 @@
             spool-anim
             (cond
               ((zero? v1-33)
-               (-> self draw art-group data 5)
+               minecartsteel-rail0-ja
                )
               ((= v1-33 1)
                (let ((a0-17 (-> self sync))
@@ -121,7 +121,7 @@
                      )
                  (t9-12 a0-17 (the-as uint a1-11) (- f0-7 (* (the float (the int (/ f0-7 1.0))) 1.0)) 0.15 0.15)
                  )
-               (-> self draw art-group data 6)
+               minecartsteel-rail1-ja
                )
               (else
                 (let ((a0-18 (-> self sync))
@@ -131,7 +131,7 @@
                       )
                   (t9-13 a0-18 (the-as uint a1-12) (- f0-10 (* (the float (the int (/ f0-10 1.0))) 1.0)) 0.15 0.15)
                   )
-                (-> self draw art-group data 7)
+                minecartsteel-rail2-ja
                 )
               )
             )

test/decompiler/reference/jak1/levels/village3/miners_REF.gc

@@ -289,7 +289,10 @@
 ;; definition for function minershort-trans-hook
 ;; INFO: Return type mismatch object vs none.
 (defbehavior minershort-trans-hook minershort ()
-  (spawn (-> self part) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 14)))
+  (spawn
+    (-> self part)
+    (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index minershort-lod0-jg candle))
+    )
   (none)
   )
 

test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc

@@ -134,7 +134,7 @@
                                  )
                                )
               )
-        (ja :group! (-> self draw art-group data 4))
+        (ja :group! gondola-idle-up-ja)
         )
       (else
         (set! (-> self anim) (new 'static 'spool-anim
@@ -151,26 +151,27 @@
                                  )
                                )
               )
-        (ja :group! (-> self draw art-group data 3))
+        (ja :group! gondola-idle-down-ja)
         )
       )
     (transform-post)
     (loop
-      (when (and *target* (and (< (vector-vector-distance
-                                    (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 3))
-                                    (target-pos 0)
-                                    )
-                                  81920.0
-                                  )
-                               (not (movie?))
-                               (not (level-hint-displayed?))
-                               (time-elapsed? (-> self state-time) (seconds 3))
-                               (file-status *art-control* (-> self anim name) 0)
-                               )
+      (when (and *target*
+                 (and (< (vector-vector-distance
+                           (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index gondola-lod0-jg main))
+                           (target-pos 0)
+                           )
+                         81920.0
+                         )
+                      (not (movie?))
+                      (not (level-hint-displayed?))
+                      (time-elapsed? (-> self state-time) (seconds 3))
+                      (file-status *art-control* (-> self anim name) 0)
+                      )
                  )
         (let ((s3-0 (get-reminder (get-task-control (game-task village3-button)) 2))
               (s4-1 (and *cheat-mode* (cpad-hold? 0 l3)))
-              (s5-1 (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 3)))
+              (s5-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index gondola-lod0-jg main)))
               )
           (cond
             ((not (or s4-1 (task-closed? (game-task village3-button) (task-status need-hint))))
@@ -269,8 +270,8 @@
       (process-spawn othercam self 4 #f #t :to self)
       (ja-play-spooled-anim
         (-> self anim)
-        (the-as art-joint-anim (-> self draw art-group data 3))
-        (the-as art-joint-anim (-> self draw art-group data 4))
+        (the-as art-joint-anim gondola-idle-down-ja)
+        (the-as art-joint-anim gondola-idle-up-ja)
         (the-as (function process-drawable symbol) false-func)
         )
       (remove-setting! 'sound-flava)
@@ -311,8 +312,8 @@
       (process-spawn othercam self 4 #f #t :to self)
       (ja-play-spooled-anim
         (-> self anim)
-        (the-as art-joint-anim (-> self draw art-group data 4))
-        (the-as art-joint-anim (-> self draw art-group data 3))
+        (the-as art-joint-anim gondola-idle-up-ja)
+        (the-as art-joint-anim gondola-idle-down-ja)
         (the-as (function process-drawable symbol) false-func)
         )
       (remove-setting! 'sound-flava)

test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc

@@ -95,16 +95,13 @@
     (ja-channel-set! 1)
     (send-event self 'do-effect 'death-warp-in -1.0)
     (sound-play "warpgate-tele")
-    (ja-no-eval :group! (-> self draw art-group data 41)
-                :num! (seek! (ja-aframe 50.0 0))
-                :frame-num (ja-aframe 40.0 0)
-                )
+    (ja-no-eval :group! eichar-duck-high-jump-ja :num! (seek! (ja-aframe 50.0 0)) :frame-num (ja-aframe 40.0 0))
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek! (ja-aframe 50.0 0)))
       )
     (restore-collide-with-as (-> self control))
-    (ja-no-eval :group! (-> self draw art-group data 41) :num! (seek!) :frame-num (ja-aframe 50.0 0))
+    (ja-no-eval :group! eichar-duck-high-jump-ja :num! (seek!) :frame-num (ja-aframe 50.0 0))
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))

test/decompiler/reference/jak2/decompiler-macros.gc

@@ -1282,6 +1282,23 @@
       )
   )
 
+(defmacro joint-name->index (jg-name name)
+  (let ((jg-info (hash-table-try-ref *jg-info* (symbol->string jg-name))))
+      (if (not (car jg-info))
+          -1
+          (let ((joint-node (hash-table-try-ref (cdr jg-info) (if (integer? name) (int->string name) (symbol->string name)))))
+              (if (not (car joint-node))
+                  -1
+                  (cadr (cdr joint-node)))
+              )
+          )
+      )
+  )
+
+(defmacro joint-node-index (jg name)
+  `(-> self node-list data (joint-name->index ,jg ,name))
+  )
+
 (defmacro defskelgroup (name ag-name joint-geom joint-anim lods
                         &key (shadow 0)
                         &key bounds

test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc

@@ -543,7 +543,7 @@ This commonly includes things such as:
   :virtual #t
   :code (behavior ()
     (until #f
-      (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! lgconveyor-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))

test/decompiler/reference/jak2/engine/common_objs/powerups_REF.gc

@@ -856,7 +856,7 @@
                (not (time-elapsed? (-> self control last-time-on-surface) (seconds 0.05)))
                )
           )
-     (let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 38))))
+     (let ((gp-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg RbigToe))))
        (if (and (< (fabs (vector-dot
                            (-> self control dynam gravity-normal)
                            (vector-! (new 'stack-no-clear 'vector) gp-0 (-> self control trans))
@@ -869,7 +869,7 @@
            (launch-particles :system *sp-particle-system-3d* (-> *part-id-table* 165) gp-0)
            )
        )
-     (let ((gp-1 (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 31))))
+     (let ((gp-1 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg LbigToe))))
        (if (and (< (fabs (vector-dot
                            (-> self control dynam gravity-normal)
                            (vector-! (new 'stack-no-clear 'vector) gp-1 (-> self control trans))

test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc

@@ -646,11 +646,11 @@
         (let ((s5-0 30)
               (v1-3 (ja-group))
               )
-          (when (not (and (and v1-3 (= v1-3 (-> self draw art-group data 161))) (= (ja-group-size) 4)))
+          (when (not (and (and v1-3 (= v1-3 jakb-board-turn-left-ja)) (= (ja-group-size) 4)))
             (let ((v1-10 (ja-group)))
-              (when (and v1-10 (= v1-10 (-> self draw art-group data 170)))
+              (when (and v1-10 (= v1-10 jakb-board-get-on-ja))
                 (ja-channel-set! 1)
-                (ja-no-eval :group! (-> self draw art-group data 190) :num! (seek! max 1.8) :frame-num 0.0)
+                (ja-no-eval :group! jakb-board-get-on-land-ja :num! (seek! max 1.8) :frame-num 0.0)
                 (until (ja-done? 0)
                   (suspend)
                   (ja :num! (seek! max 1.8))
@@ -667,15 +667,15 @@
         (ground-tween-initialize
           gp-0
           (the-as uint 0)
-          (the-as uint (-> self draw art-group data 153))
-          (the-as uint (-> self draw art-group data 163))
-          (the-as uint (-> self draw art-group data 164))
-          (the-as uint (-> self draw art-group data 162))
-          (the-as uint (-> self draw art-group data 161))
+          (the-as uint jakb-board-turn-ja)
+          (the-as uint jakb-board-turn-up-ja)
+          (the-as uint jakb-board-turn-down-ja)
+          (the-as uint jakb-board-turn-right-ja)
+          (the-as uint jakb-board-turn-left-ja)
           f30-0
           )
         )
-      (ja :chan 3 :group! (-> self draw art-group data 152))
+      (ja :chan 3 :group! jakb-board-duck-turn-ja)
       (until #f
         (target-board-turn-anim 0)
         (let ((f0-10 (* 1.6 (-> self control ctrl-slope-z)))
@@ -701,13 +701,9 @@
                (set! (-> a0-27 frame-interp 1) f0-14)
                (set! (-> a0-27 frame-interp 0) f0-14)
                )
-             (set! (-> a0-27 frame-group) (the-as art-joint-anim (-> self draw art-group data 152)))
+             (set! (-> a0-27 frame-group) (the-as art-joint-anim jakb-board-duck-turn-ja))
              (set! (-> a0-27 param 0) 0.0)
-             (joint-control-channel-group-eval!
-               a0-27
-               (the-as art-joint-anim (-> self draw art-group data 152))
-               num-func-chan
-               )
+             (joint-control-channel-group-eval! a0-27 (the-as art-joint-anim jakb-board-duck-turn-ja) num-func-chan)
              )
            )
           (else
@@ -716,13 +712,9 @@
                 (set! (-> a0-28 frame-interp 1) f0-17)
                 (set! (-> a0-28 frame-interp 0) f0-17)
                 )
-              (set! (-> a0-28 frame-group) (the-as art-joint-anim (-> self draw art-group data 177)))
+              (set! (-> a0-28 frame-group) (the-as art-joint-anim jakb-board-air-turn-ja))
               (set! (-> a0-28 param 0) 0.0)
-              (joint-control-channel-group-eval!
-                a0-28
-                (the-as art-joint-anim (-> self draw art-group data 177))
-                num-func-chan
-                )
+              (joint-control-channel-group-eval! a0-28 (the-as art-joint-anim jakb-board-air-turn-ja) num-func-chan)
               )
             )
           )
@@ -1010,7 +1002,7 @@
     (case arg2
       (('hit)
        (ja-channel-push! 1 (seconds 0.05))
-       (ja-no-eval :group! (-> self draw art-group data 158) :num! (seek!) :frame-num 0.0)
+       (ja-no-eval :group! jakb-board-hit-ja :num! (seek!) :frame-num 0.0)
        (until (ja-done? 0)
          (suspend)
          (ja :num! (seek!))
@@ -1019,7 +1011,7 @@
        )
       (else
         (ja-channel-push! 1 (seconds 0.05))
-        (ja :group! (-> self draw art-group data 155) :num! min)
+        (ja :group! jakb-board-jump-ja :num! min)
         (suspend)
         (until (ja-done? 0)
           (let ((f30-0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))
@@ -1049,7 +1041,7 @@
         (ja-channel-push! 1 (seconds 0.05))
         )
       )
-    (ja :group! (-> self draw art-group data 156))
+    (ja :group! jakb-board-jump-loop-ja)
     (until #f
       (suspend)
       (ja :num! (loop!))
@@ -1285,23 +1277,17 @@
     (cond
       ((not (time-elapsed? (-> self board halfpipe-jump-time) (seconds 0.5)))
        (ja-channel-push! 1 (seconds 0.05))
-       (ja-no-eval :group! (-> self draw art-group data 155) :num! (seek! (ja-aframe 8.0 0) 0.5) :frame-num 0.0)
+       (ja-no-eval :group! jakb-board-jump-ja :num! (seek! (ja-aframe 8.0 0) 0.5) :frame-num 0.0)
        (until (ja-done? 0)
          (suspend)
          (ja :num! (seek! (ja-aframe 8.0 0) 0.5))
          )
-       (ja-no-eval :group! (-> self draw art-group data 155)
-                   :num! (seek! (ja-aframe 10.0 0) 0.2)
-                   :frame-num (ja-aframe 8.0 0)
-                   )
+       (ja-no-eval :group! jakb-board-jump-ja :num! (seek! (ja-aframe 10.0 0) 0.2) :frame-num (ja-aframe 8.0 0))
        (until (ja-done? 0)
          (suspend)
          (ja :num! (seek! (ja-aframe 10.0 0) 0.2))
          )
-       (ja-no-eval :group! (-> self draw art-group data 155)
-                   :num! (seek! (ja-aframe 12.0 0) 0.1)
-                   :frame-num (ja-aframe 10.0 0)
-                   )
+       (ja-no-eval :group! jakb-board-jump-ja :num! (seek! (ja-aframe 12.0 0) 0.1) :frame-num (ja-aframe 10.0 0))
        (until (ja-done? 0)
          (suspend)
          (ja :num! (seek! (ja-aframe 12.0 0) 0.1))
@@ -1340,19 +1326,19 @@
   :code (behavior ()
     (let ((v1-2 (ja-group)))
       (cond
-        ((and v1-2 (= v1-2 (-> self draw art-group data 156)))
+        ((and v1-2 (= v1-2 jakb-board-jump-loop-ja))
          )
         ((let ((v1-8 (ja-group)))
-           (and v1-8 (= v1-8 (-> self draw art-group data 187)))
+           (and v1-8 (= v1-8 jakb-board-noseflip-ja))
            )
          (ja-no-eval :num! (seek!))
          (ja-channel-push! 1 (seconds 0.5))
          )
         ((let ((v1-22 (ja-group)))
-           (and v1-22 (or (= v1-22 (-> self draw art-group data 178))
-                          (= v1-22 (-> self draw art-group data 182))
-                          (= v1-22 (-> self draw art-group data 159))
-                          (= v1-22 (-> self draw art-group data 181))
+           (and v1-22 (or (= v1-22 jakb-board-flip-backward-ja)
+                          (= v1-22 jakb-board-flip-backward-loop-ja)
+                          (= v1-22 jakb-board-flip-forward-ja)
+                          (= v1-22 jakb-board-flip-forward-loop-ja)
                           )
                 )
            )
@@ -1362,7 +1348,7 @@
         (else
           (let ((v1-36 (ja-group)))
             (cond
-              ((and v1-36 (= v1-36 (-> self draw art-group data 176)))
+              ((and v1-36 (= v1-36 jakb-board-spin-ja))
                (ja-no-eval :num! (seek!))
                (ja-channel-push! 1 (seconds 0.1))
                )
@@ -1376,14 +1362,14 @@
       )
     (cond
       ((focus-test? self halfpipe)
-       (ja :group! (-> self draw art-group data 152) :num! (identity (ja-aframe 0.0 0)))
+       (ja :group! jakb-board-duck-turn-ja :num! (identity (ja-aframe 0.0 0)))
        (loop
          (suspend)
          (ja-blend-eval)
          )
        )
       (else
-        (ja :group! (-> self draw art-group data 156))
+        (ja :group! jakb-board-jump-loop-ja)
         (loop
           (suspend)
           (ja-blend-eval)
@@ -1425,13 +1411,13 @@
     )
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 154) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! jakb-board-jump-kick-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
       )
     (ja-channel-push! 1 (seconds 2))
-    (ja :group! (-> self draw art-group data 156))
+    (ja :group! jakb-board-jump-loop-ja)
     (until #f
       (suspend)
       (ja :num! (loop!))
@@ -1465,7 +1451,7 @@
   :exit target-board-exit
   :trans target-board-jump-trans
   :code (behavior ((arg0 vector) (arg1 float))
-    (ja-no-eval :group! (-> self draw art-group data 188) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! jakb-board-jump-kickoff-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (if (and (jump-hit-ground-stuck?) (< 31.0 (ja-aframe-num 0)))
           (go target-board-hit-ground)
@@ -1587,14 +1573,14 @@
                 (cond
                   ((zero? s4-0)
                    (ja-channel-push! 1 (seconds 0.1))
-                   (ja-no-eval :group! (-> self draw art-group data 159) :num! (seek! (ja-aframe 15.0 0)) :frame-num 0.0)
+                   (ja-no-eval :group! jakb-board-flip-forward-ja :num! (seek! (ja-aframe 15.0 0)) :frame-num 0.0)
                    (until (ja-done? 0)
                      (suspend)
                      (ja :num! (seek! (ja-aframe 15.0 0)))
                      )
                    )
                   (else
-                    (ja-no-eval :group! (-> self draw art-group data 181) :num! (seek!) :frame-num 0.0)
+                    (ja-no-eval :group! jakb-board-flip-forward-loop-ja :num! (seek!) :frame-num 0.0)
                     (until (ja-done? 0)
                       (suspend)
                       (ja :num! (seek!))
@@ -1604,14 +1590,14 @@
                 )
               ((zero? s4-0)
                (ja-channel-push! 1 (seconds 0.1))
-               (ja-no-eval :group! (-> self draw art-group data 178) :num! (seek! (ja-aframe 10.0 0)) :frame-num 0.0)
+               (ja-no-eval :group! jakb-board-flip-backward-ja :num! (seek! (ja-aframe 10.0 0)) :frame-num 0.0)
                (until (ja-done? 0)
                  (suspend)
                  (ja :num! (seek! (ja-aframe 10.0 0)))
                  )
                )
               (else
-                (ja-no-eval :group! (-> self draw art-group data 182) :num! (seek!) :frame-num 0.0)
+                (ja-no-eval :group! jakb-board-flip-backward-loop-ja :num! (seek!) :frame-num 0.0)
                 (until (ja-done? 0)
                   (suspend)
                   (ja :num! (seek!))
@@ -1626,7 +1612,7 @@
         )
       (cond
         (gp-0
-          (ja-no-eval :group! (-> self draw art-group data 159) :num! (seek!) :frame-num (ja-aframe 15.0 0))
+          (ja-no-eval :group! jakb-board-flip-forward-ja :num! (seek!) :frame-num (ja-aframe 15.0 0))
           (until (ja-done? 0)
             (if (jump-hit-ground-stuck?)
                 (go target-board-hit-ground)
@@ -1636,7 +1622,7 @@
             )
           )
         (else
-          (ja-no-eval :group! (-> self draw art-group data 178) :num! (seek!) :frame-num (ja-aframe 10.0 0))
+          (ja-no-eval :group! jakb-board-flip-backward-ja :num! (seek!) :frame-num (ja-aframe 10.0 0))
           (until (ja-done? 0)
             (if (jump-hit-ground-stuck?)
                 (go target-board-hit-ground)
@@ -1695,7 +1681,7 @@
       (-> v1-3 id)
       )
     (let ((v1-7 (ja-group)))
-      (if (and v1-7 (= v1-7 (-> self draw art-group data 187)))
+      (if (and v1-7 (= v1-7 jakb-board-noseflip-ja))
           (sound-play "board-boots")
           )
       )
@@ -1735,25 +1721,25 @@
             ((< f30-0 0.0)
              (let ((v1-3 (ja-group)))
                (cond
-                 ((and v1-3 (= v1-3 (-> self draw art-group data 183)))
+                 ((and v1-3 (= v1-3 jakb-board-method-loop-ja))
                   (ja :num! (loop!))
                   )
                  (else
                    (add-to-trick-list (-> self board) (board-tricks board-method) 500.0)
                    (set! (-> self board unknown-sound-id01) (sound-play "board-method"))
                    (ja-channel-push! 1 (seconds 0.08))
-                   (ja-no-eval :group! (-> self draw art-group data 174) :num! (seek!) :frame-num 0.0)
+                   (ja-no-eval :group! jakb-board-method-ja :num! (seek!) :frame-num 0.0)
                    (until (ja-done? 0)
                      (suspend)
                      (ja :num! (seek!))
                      )
-                   (ja :group! (-> self draw art-group data 183) :num! min)
+                   (ja :group! jakb-board-method-loop-ja :num! min)
                    )
                  )
                )
              )
             ((let ((v1-45 (ja-group)))
-               (and v1-45 (= v1-45 (-> self draw art-group data 185)))
+               (and v1-45 (= v1-45 jakb-board-nosegrab-loop-ja))
                )
              (ja :num! (loop!))
              )
@@ -1761,18 +1747,18 @@
              (add-to-trick-list (-> self board) (board-tricks board-nosegrab) 500.0)
              (set! (-> self board unknown-sound-id01) (sound-play "board-nosegrab"))
              (ja-channel-push! 1 (seconds 0.08))
-             (ja-no-eval :group! (-> self draw art-group data 173) :num! (seek!) :frame-num 0.0)
+             (ja-no-eval :group! jakb-board-nosegrab-ja :num! (seek!) :frame-num 0.0)
              (until (ja-done? 0)
                (suspend)
                (ja :num! (seek!))
                )
-             (ja :group! (-> self draw art-group data 185) :num! min)
+             (ja :group! jakb-board-nosegrab-loop-ja :num! min)
              )
             (else
               (add-to-trick-list (-> self board) (board-tricks board-noseflip) 500.0)
               (set! (-> self board unknown-sound-id01) (sound-play "board-noseflip"))
               (ja-channel-push! 1 (seconds 0.08))
-              (ja-no-eval :group! (-> self draw art-group data 187) :num! (seek! (ja-aframe 20.0 0)) :frame-num 0.0)
+              (ja-no-eval :group! jakb-board-noseflip-ja :num! (seek! (ja-aframe 20.0 0)) :frame-num 0.0)
               (until (ja-done? 0)
                 (suspend)
                 (ja :num! (seek! (ja-aframe 20.0 0)))
@@ -1787,19 +1773,19 @@
     (label cfg-36)
     (let ((v1-121 (ja-group)))
       (cond
-        ((and v1-121 (= v1-121 (-> self draw art-group data 183)))
+        ((and v1-121 (= v1-121 jakb-board-method-loop-ja))
          (ja-channel-push! 1 (seconds 0.08))
-         (ja-no-eval :group! (-> self draw art-group data 184) :num! (seek! max 1.5) :frame-num 0.0)
+         (ja-no-eval :group! jakb-board-method-end-ja :num! (seek! max 1.5) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek! max 1.5))
            )
          )
         ((let ((v1-151 (ja-group)))
-           (and v1-151 (= v1-151 (-> self draw art-group data 185)))
+           (and v1-151 (= v1-151 jakb-board-nosegrab-loop-ja))
            )
          (ja-channel-push! 1 (seconds 0.08))
-         (ja-no-eval :group! (-> self draw art-group data 186) :num! (seek! max 1.5) :frame-num 0.0)
+         (ja-no-eval :group! jakb-board-nosegrab-end-ja :num! (seek! max 1.5) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek! max 1.5))
@@ -1882,19 +1868,19 @@
               (add-to-trick-list (-> self board) (board-tricks board-kickflip) 500.0)
               (set! (-> self board unknown-sound-id01) (sound-play "board-kickflip"))
               (ja-channel-push! 1 (seconds 0.07))
-              (ja-no-eval :group! (-> self draw art-group data 175) :num! (seek!) :frame-num 0.0)
+              (ja-no-eval :group! jakb-board-kickflip-a-ja :num! (seek!) :frame-num 0.0)
               (until (ja-done? 0)
                 (suspend)
                 (ja :num! (seek!))
                 )
               (send-event (ppointer->process (-> self sidekick)) 'matrix #f)
-              (ja-no-eval :group! (-> self draw art-group data 192) :num! (seek! max 1.05) :frame-num 0.0)
+              (ja-no-eval :group! jakb-board-kickflip-b-ja :num! (seek! max 1.05) :frame-num 0.0)
               (until (ja-done? 0)
                 (suspend)
                 (ja :num! (seek! max 1.05))
                 )
               (send-event (ppointer->process (-> self sidekick)) 'matrix 'board)
-              (ja-no-eval :group! (-> self draw art-group data 193) :num! (seek!) :frame-num 0.0)
+              (ja-no-eval :group! jakb-board-kickflip-c-ja :num! (seek!) :frame-num 0.0)
               (until (ja-done? 0)
                 (suspend)
                 (ja :num! (seek!))
@@ -1904,7 +1890,7 @@
               (add-to-trick-list (-> self board) (board-tricks board-board-spin) 500.0)
               (set! (-> self board unknown-sound-id01) (sound-play "board-boardspin"))
               (ja-channel-push! 1 (seconds 0.05))
-              (ja-no-eval :group! (-> self draw art-group data 176) :num! (seek! max 0.95) :frame-num 0.0)
+              (ja-no-eval :group! jakb-board-spin-ja :num! (seek! max 0.95) :frame-num 0.0)
               (until (ja-done? 0)
                 (suspend)
                 (ja :num! (seek! max 0.95))
@@ -1958,7 +1944,7 @@
     (set! (-> self control mod-surface) *board-walk-mods*)
     (let ((v1-3 (ja-group)))
       (cond
-        ((and v1-3 (or (= v1-3 (-> self draw art-group data 184)) (= v1-3 (-> self draw art-group data 186))))
+        ((and v1-3 (or (= v1-3 jakb-board-method-end-ja) (= v1-3 jakb-board-nosegrab-end-ja)))
          (ja-no-eval :num! (seek! max 1.5))
          (while (not (ja-done? 0))
            (suspend)
@@ -1966,20 +1952,20 @@
            )
          )
         ((let ((v1-18 (ja-group)))
-           (and v1-18 (= v1-18 (-> self draw art-group data 183)))
+           (and v1-18 (= v1-18 jakb-board-method-loop-ja))
            )
          (ja-channel-push! 1 (seconds 0.08))
-         (ja-no-eval :group! (-> self draw art-group data 184) :num! (seek! max 1.5) :frame-num 0.0)
+         (ja-no-eval :group! jakb-board-method-end-ja :num! (seek! max 1.5) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek! max 1.5))
            )
          )
         ((let ((v1-48 (ja-group)))
-           (and v1-48 (= v1-48 (-> self draw art-group data 185)))
+           (and v1-48 (= v1-48 jakb-board-nosegrab-loop-ja))
            )
          (ja-channel-push! 1 (seconds 0.08))
-         (ja-no-eval :group! (-> self draw art-group data 186) :num! (seek! max 1.5) :frame-num 0.0)
+         (ja-no-eval :group! jakb-board-nosegrab-end-ja :num! (seek! max 1.5) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek! max 1.5))
@@ -2259,16 +2245,16 @@
     (let* ((v1-1 (-> self board ride-mode))
            (gp-0 (cond
                    ((zero? v1-1)
-                    (-> self draw art-group data 167)
+                    jakb-board-ride-turn-front-ja
                     )
                    ((= v1-1 1)
-                    (-> self draw art-group data 166)
+                    jakb-board-ride-turn-back-ja
                     )
                    ((= v1-1 2)
-                    (-> self draw art-group data 169)
+                    jakb-board-ride-turn-left-ja
                     )
                    ((= v1-1 3)
-                    (-> self draw art-group data 168)
+                    jakb-board-ride-turn-right-ja
                     )
                    (else
                      (the-as art-element #f)
@@ -2368,12 +2354,12 @@
     )
   :code (behavior ((arg0 handle))
     (ja-channel-push! 1 (seconds 0.05))
-    (ja-no-eval :group! (-> self draw art-group data 172) :num! (seek! (ja-aframe 19.0 0)) :frame-num 0.0)
+    (ja-no-eval :group! jakb-board-grenade-ja :num! (seek! (ja-aframe 19.0 0)) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek! (ja-aframe 19.0 0)))
       )
-    (let ((a1-5 (-> self node-list data 41))
+    (let ((a1-5 (joint-node-index jakb-lod0-jg extra))
           (s5-2 (new 'stack-no-clear 'projectile-init-by-other-params))
           )
       (let ((a0-7 (handle->process arg0)))
@@ -2536,7 +2522,7 @@
                      )
                  )
           )
-      (ja-no-eval :group! (-> self draw art-group data 170) :num! (seek! max f30-1) :frame-num 0.0)
+      (ja-no-eval :group! jakb-board-get-on-ja :num! (seek! max f30-1) :frame-num 0.0)
       (until (ja-done? 0)
         (when (logtest? (-> self control status) (collide-status on-surface))
           (set! (-> self board turn-anim-duck-vel) 0.0)
@@ -2578,7 +2564,7 @@
     )
   :exit target-board-exit
   :code (behavior ((arg0 handle))
-    (let ((s4-0 (-> self draw art-group data 195))
+    (let ((s4-0 jakb-board-attack-pegasus-ja)
           (f30-0 0.0)
           (s5-0 #t)
           )
@@ -2752,7 +2738,7 @@
         (cond
           ((= v1-1 'hit)
            (ja-channel-push! 1 (seconds 0.1))
-           (ja-no-eval :group! (-> self draw art-group data 194) :num! (seek! (ja-aframe 24.0 0) 2.5) :frame-num 0.0)
+           (ja-no-eval :group! jakb-board-hit-get-off-ja :num! (seek! (ja-aframe 24.0 0) 2.5) :frame-num 0.0)
            (until (ja-done? 0)
              (suspend)
              (ja :num! (seek! (ja-aframe 24.0 0) 2.5))
@@ -2760,13 +2746,13 @@
            )
           ((-> self control unknown-spool-anim00)
            (ja-channel-push! 1 (seconds 0.1))
-           (ja-no-eval :group! (-> self draw art-group data 191) :num! (seek! max f30-0) :frame-num 0.0)
+           (ja-no-eval :group! jakb-board-get-off-pre-ja :num! (seek! max f30-0) :frame-num 0.0)
            (until (ja-done? 0)
              (suspend)
              (ja :num! (seek! max f30-0))
              )
            (send-event (ppointer->process (-> self sidekick)) 'matrix 'normal)
-           (ja-no-eval :group! (-> self draw art-group data 171) :num! (seek! (ja-aframe 24.0 0) f30-0) :frame-num 0.0)
+           (ja-no-eval :group! jakb-board-get-off-ja :num! (seek! (ja-aframe 24.0 0) f30-0) :frame-num 0.0)
            (until (ja-done? 0)
              (if (and (jump-hit-ground-stuck?) (>= (ja-aframe-num 0) 14.0))
                  (go target-falling #f)
@@ -2779,7 +2765,7 @@
             (set! f30-0 (fmax 0.5 (fmin 2.0 (/ 150.0 (the float (target-time-to-ground))))))
             (ja-channel-push! 1 (seconds 0.1))
             (send-event (ppointer->process (-> self sidekick)) 'matrix 'normal)
-            (ja-no-eval :group! (-> self draw art-group data 171)
+            (ja-no-eval :group! jakb-board-get-off-ja
                         :num! (seek! (ja-aframe 24.0 0) f30-0)
                         :frame-num (ja-aframe 11.0 0)
                         )
@@ -2886,9 +2872,9 @@
     )
   :code (behavior ((arg0 symbol))
     (let ((v1-2 (ja-group)))
-      (when (not (and v1-2 (= v1-2 (-> self draw art-group data 151))))
+      (when (not (and v1-2 (= v1-2 jakb-board-stance-ja)))
         (ja-channel-push! 1 (seconds 0.1))
-        (ja :group! (-> self draw art-group data 151) :num! (identity (ja-aframe 0.0 0)))
+        (ja :group! jakb-board-stance-ja :num! (identity (ja-aframe 0.0 0)))
         )
       )
     (until #f
@@ -3074,11 +3060,11 @@
           )
         (set! (-> self control mod-surface) *smack-mods*)
         (let ((v1-92 (ja-group)))
-          (when (not (and v1-92 (or (= v1-92 (-> self draw art-group data 158)) (= v1-92 (-> self draw art-group data 165)))))
+          (when (not (and v1-92 (or (= v1-92 jakb-board-hit-ja) (= v1-92 jakb-board-hit-forward-ja))))
             (ja-channel-push! 1 (seconds 0.075))
             (if (or (= (-> gp-0 mode) 'shock) (= (-> gp-0 mode) 'shock-red) (= (-> gp-0 mode) 'shockup))
-                (ja :group! (-> self draw art-group data 189) :num! min)
-                (ja :group! (-> self draw art-group data 158) :num! min)
+                (ja :group! jakb-board-hit-elec-ja :num! min)
+                (ja :group! jakb-board-hit-ja :num! min)
                 )
             )
           )

test/decompiler/reference/jak2/engine/target/board/board-util_REF.gc

@@ -110,10 +110,10 @@
     (ja-channel-push! 1 (seconds 0.1))
     (cond
       (arg0
-        (ja :group! (-> self draw art-group data 4) :num! max)
+        (ja :group! board-close-ja :num! max)
         )
       (else
-        (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+        (ja-no-eval :group! board-close-ja :num! (seek!) :frame-num 0.0)
         (until (ja-done? 0)
           (suspend)
           (ja :num! (seek!))
@@ -173,7 +173,7 @@
   :code (behavior ()
     (set! (-> self draw shadow) (-> self shadow-backup))
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! board-open-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))

test/decompiler/reference/jak2/engine/target/gun/gun-states_REF.gc

@@ -13,18 +13,18 @@
            (cond
              ((= gp-0 2)
               (if (logtest? (-> self game features) (game-feature gun-upgrade-speed))
-                  (set! (-> self control unknown-word04) (the-as uint (-> self draw art-group data 309)))
-                  (set! (-> self control unknown-word04) (the-as uint (-> self draw art-group data 256)))
+                  (set! (-> self control unknown-word04) (the-as uint jakb-gun-red-fire-fast-ja))
+                  (set! (-> self control unknown-word04) (the-as uint jakb-gun-red-fire-ja))
                   )
               )
              ((= gp-0 4)
-              (set! (-> self control unknown-word04) (the-as uint (-> self draw art-group data 259)))
+              (set! (-> self control unknown-word04) (the-as uint jakb-gun-dark-fire-ja))
               )
              ((= gp-0 1)
-              (set! (-> self control unknown-word04) (the-as uint (-> self draw art-group data 246)))
+              (set! (-> self control unknown-word04) (the-as uint jakb-gun-yellow-fire-low-ja))
               )
              ((= gp-0 3)
-              (set! (-> self control unknown-word04) (the-as uint (-> self draw art-group data 258)))
+              (set! (-> self control unknown-word04) (the-as uint jakb-gun-blue-fire-single-ja))
               )
              )
            )

test/decompiler/reference/jak2/engine/target/gun/gun-util_REF.gc

@@ -551,7 +551,7 @@
     (ja-channel-set! 1)
     (set! (-> self read-scale) #f)
     (until #f
-      (ja-no-eval :group! (-> self draw art-group data 12) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! gun-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
@@ -626,84 +626,84 @@
       (set! (-> self gun-type) a0-5)
       (cond
         ((and (= v1-0 (pickup-type eco-yellow)) (= a0-5 (pickup-type eco-red)))
-         (ja-no-eval :group! (-> self draw art-group data 28) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! gun-gun-yellow-red-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
          )
         ((and (= v1-0 (pickup-type eco-yellow)) (= a0-5 (pickup-type eco-blue)))
-         (ja-no-eval :group! (-> self draw art-group data 27) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! gun-gun-yellow-blue-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
          )
         ((and (= v1-0 (pickup-type eco-yellow)) (= a0-5 (pickup-type eco-dark)))
-         (ja-no-eval :group! (-> self draw art-group data 26) :num! (seek! 0.0) :frame-num max)
+         (ja-no-eval :group! gun-gun-dark-yellow-ja :num! (seek! 0.0) :frame-num max)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek! 0.0))
            )
          )
         ((and (= v1-0 (pickup-type eco-red)) (= a0-5 (pickup-type eco-yellow)))
-         (ja-no-eval :group! (-> self draw art-group data 28) :num! (seek! 0.0) :frame-num max)
+         (ja-no-eval :group! gun-gun-yellow-red-ja :num! (seek! 0.0) :frame-num max)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek! 0.0))
            )
          )
         ((and (= v1-0 (pickup-type eco-red)) (= a0-5 (pickup-type eco-blue)))
-         (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek! 0.0) :frame-num max)
+         (ja-no-eval :group! gun-gun-blue-red-ja :num! (seek! 0.0) :frame-num max)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek! 0.0))
            )
          )
         ((and (= v1-0 (pickup-type eco-red)) (= a0-5 (pickup-type eco-dark)))
-         (ja-no-eval :group! (-> self draw art-group data 23) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! gun-gun-red-dark-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
          )
         ((and (= v1-0 (pickup-type eco-blue)) (= a0-5 (pickup-type eco-yellow)))
-         (ja-no-eval :group! (-> self draw art-group data 27) :num! (seek! 0.0) :frame-num max)
+         (ja-no-eval :group! gun-gun-yellow-blue-ja :num! (seek! 0.0) :frame-num max)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek! 0.0))
            )
          )
         ((and (= v1-0 (pickup-type eco-blue)) (= a0-5 (pickup-type eco-red)))
-         (ja-no-eval :group! (-> self draw art-group data 30) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! gun-gun-blue-red-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
          )
         ((and (= v1-0 (pickup-type eco-blue)) (= a0-5 (pickup-type eco-dark)))
-         (ja-no-eval :group! (-> self draw art-group data 29) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! gun-gun-blue-dark-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
          )
         ((and (= v1-0 (pickup-type eco-dark)) (= a0-5 (pickup-type eco-yellow)))
-         (ja-no-eval :group! (-> self draw art-group data 26) :num! (seek!) :frame-num 0.0)
+         (ja-no-eval :group! gun-gun-dark-yellow-ja :num! (seek!) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek!))
            )
          )
         ((and (= v1-0 (pickup-type eco-dark)) (= a0-5 (pickup-type eco-red)))
-         (ja-no-eval :group! (-> self draw art-group data 23) :num! (seek! 0.0) :frame-num max)
+         (ja-no-eval :group! gun-gun-red-dark-ja :num! (seek! 0.0) :frame-num max)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek! 0.0))
            )
          )
         ((and (= v1-0 (pickup-type eco-dark)) (= a0-5 (pickup-type eco-blue)))
-         (ja-no-eval :group! (-> self draw art-group data 29) :num! (seek! 0.0) :frame-num max)
+         (ja-no-eval :group! gun-gun-blue-dark-ja :num! (seek! 0.0) :frame-num max)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek! 0.0))
@@ -714,16 +714,16 @@
     (let* ((v1-268 (-> self gun-type))
            (gp-0 (cond
                    ((= v1-268 (pickup-type eco-yellow))
-                    (-> self draw art-group data 15)
+                    gun-idle-yellow-ja
                     )
                    ((= v1-268 (pickup-type eco-red))
-                    (-> self draw art-group data 13)
+                    gun-idle-red-ja
                     )
                    ((= v1-268 (pickup-type eco-blue))
-                    (-> self draw art-group data 16)
+                    gun-idle-blue-ja
                     )
                    (else
-                     (-> self draw art-group data 14)
+                     gun-idle-dark-ja
                      )
                    )
                  )
@@ -806,7 +806,7 @@
                    ((string= s2-0 "jakb-gun-blue-takeout")
                     (if (>= f30-0 (-> s3-1 artist-base))
                         (ja :group! s3-1 :num! (identity (ja-aframe f30-0 0)))
-                        (ja :group! (-> self draw art-group data 12))
+                        (ja :group! gun-idle-ja)
                         )
                     )
                    ((or (string= s2-0 "jakb-gun-dark-takeout") (string= s2-0 "jakb-pilot-gun-dark-takeout"))
@@ -819,7 +819,7 @@
                     (ja :group! s3-1 :num! (identity (ja-aframe f30-0 0)))
                     )
                    (else
-                     (ja :group! (-> self draw art-group data 12))
+                     (ja :group! gun-idle-ja)
                      )
                    )
                  )
@@ -852,7 +852,7 @@
                        )
                   )
             )
-        (vector<-cspace! (-> (the-as target gp-0) gun fire-point) (-> (the-as gun self) node-list data 13))
+        (vector<-cspace! (-> (the-as target gp-0) gun fire-point) (joint-node-index gun-lod0-jg muzzle))
         (set! (-> (the-as target gp-0) gun fire-dir 1 quad) (-> (the-as target gp-0) gun fire-dir 0 quad))
         (cond
           ((and (handle->process (-> (the-as target gp-0) gun track-target 0 handle))
@@ -884,7 +884,7 @@
               )
             )
           )
-        (vector<-cspace! (-> (the-as target gp-0) gun laser-point) (-> (the-as gun self) node-list data 14))
+        (vector<-cspace! (-> (the-as target gp-0) gun laser-point) (joint-node-index gun-lod0-jg laser))
         (set! (-> (the-as target gp-0) gun laser-dir 1 quad) (-> (the-as target gp-0) gun laser-dir 0 quad))
         (set! (-> (the-as target gp-0) gun laser-dir 0 quad) (-> (the-as target gp-0) gun fire-dir-out quad))
         (if s5-0

test/decompiler/reference/jak2/engine/target/logic-target_REF.gc

@@ -2312,7 +2312,7 @@
       ((and (and (-> self next-state) (= (-> self next-state name) 'target-clone-anim))
             (and (not (logtest? (-> self draw status) (draw-control-status no-draw)))
                  (begin
-                   (vector<-cspace! s5-0 (-> self node-list data 3))
+                   (vector<-cspace! s5-0 (joint-node-index jakb-lod0-jg main))
                    (+! (-> s5-0 y) -5896.192)
                    (< (fabs (- (-> s5-0 y) (-> self control trans y))) 8192.0)
                    )
@@ -2338,7 +2338,7 @@
                 )
            (set! (-> s5-0 y) (- (-> self water surface-height) (-> self water swim-height)))
            )
-       (vector<-cspace! gp-0 (-> self node-list data 6))
+       (vector<-cspace! gp-0 (joint-node-index jakb-lod0-jg chest))
        (cond
          ((>= (+ (current-time) (seconds -2)) (-> self control unknown-time-frame26))
           (set! (-> self control camera-pos quad) (-> s5-0 quad))

test/decompiler/reference/jak2/engine/target/mech/grunt-mech_REF.gc

@@ -417,7 +417,7 @@
     (let ((gp-0 (new 'stack-no-clear 'matrix)))
       (quaternion-copy! (the-as quaternion (-> gp-0 vector)) (-> self root quat))
       (set! (-> gp-0 vector 1 quad) (-> self root trans quad))
-      (ja-no-eval :group! (-> self draw art-group data 48) :num! (seek! max 0.769) :frame-num 0.0)
+      (ja-no-eval :group! grunt-mech-lunge-ja :num! (seek! max 0.769) :frame-num 0.0)
       (until (ja-done? 0)
         (let ((s5-0 *grunt-mech-info*))
           (grunt-mech-info-method-10 s5-0)
@@ -619,7 +619,7 @@
         )
     )
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 49) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! grunt-mech-grab-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -635,15 +635,12 @@
              (ja-channel-push! 1 (seconds 0.13))
              (countdown (s5-0 (get-rand-int-range self 1 2))
                (let ((s4-0 #t))
-                 (ja-no-eval :group! (-> self draw art-group data 51) :num! (seek! (ja-aframe 17.0 0) 0.222) :frame-num 0.0)
+                 (ja-no-eval :group! grunt-mech-head-butt-ja :num! (seek! (ja-aframe 17.0 0) 0.222) :frame-num 0.0)
                  (until (ja-done? 0)
                    (suspend)
                    (ja :num! (seek! (ja-aframe 17.0 0) 0.222))
                    )
-                 (ja-no-eval :group! (-> self draw art-group data 51)
-                             :num! (seek! (ja-aframe 20.0 0))
-                             :frame-num (ja-aframe 17.0 0)
-                             )
+                 (ja-no-eval :group! grunt-mech-head-butt-ja :num! (seek! (ja-aframe 20.0 0)) :frame-num (ja-aframe 17.0 0))
                  (until (ja-done? 0)
                    (when (and s4-0 (>= (ja-aframe-num 0) 18.5))
                      (grunt-mech-method-194 self)
@@ -660,12 +657,12 @@
              (ja-channel-push! 1 (seconds 0.13))
              (countdown (s5-1 (get-rand-int-range self 1 3))
                (let ((s4-1 #t))
-                 (ja-no-eval :group! (-> self draw art-group data 52) :num! (seek! (ja-aframe 24.0 0) 0.568) :frame-num 0.0)
+                 (ja-no-eval :group! grunt-mech-punch-left-ja :num! (seek! (ja-aframe 24.0 0) 0.568) :frame-num 0.0)
                  (until (ja-done? 0)
                    (suspend)
                    (ja :num! (seek! (ja-aframe 24.0 0) 0.568))
                    )
-                 (ja-no-eval :group! (-> self draw art-group data 52)
+                 (ja-no-eval :group! grunt-mech-punch-left-ja
                              :num! (seek! (ja-aframe 28.0 0) 2.0)
                              :frame-num (ja-aframe 24.0 0)
                              )
@@ -685,12 +682,12 @@
               (ja-channel-push! 1 (seconds 0.13))
               (countdown (s5-2 (get-rand-int-range self 1 3))
                 (let ((s4-2 #t))
-                  (ja-no-eval :group! (-> self draw art-group data 53) :num! (seek! (ja-aframe 30.0 0) 0.111) :frame-num 0.0)
+                  (ja-no-eval :group! grunt-mech-double-pound-ja :num! (seek! (ja-aframe 30.0 0) 0.111) :frame-num 0.0)
                   (until (ja-done? 0)
                     (suspend)
                     (ja :num! (seek! (ja-aframe 30.0 0) 0.111))
                     )
-                  (ja-no-eval :group! (-> self draw art-group data 53)
+                  (ja-no-eval :group! grunt-mech-double-pound-ja
                               :num! (seek! (ja-aframe 32.0 0) 0.5)
                               :frame-num (ja-aframe 30.0 0)
                               )
@@ -710,7 +707,7 @@
           )
         (when (= (get-rand-int self 4) 3)
           (ja-channel-push! 1 (seconds 0.13))
-          (ja-no-eval :group! (-> self draw art-group data 50) :num! (seek! max 0.090909) :frame-num 0.0)
+          (ja-no-eval :group! grunt-mech-idle0-ja :num! (seek! max 0.090909) :frame-num 0.0)
           (until (ja-done? 0)
             (suspend)
             (ja :num! (seek! max 0.090909))
@@ -769,7 +766,7 @@
       (quaternion-look-at! (the-as quaternion (-> gp-0 vector 2)) (-> gp-0 vector 1) *up-vector*)
       (quaternion-copy! (the-as quaternion (-> gp-0 vector)) (-> self root quat))
       (set! (-> gp-0 vector 1 quad) (-> self root trans quad))
-      (ja-no-eval :group! (-> self draw art-group data 54) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! grunt-mech-dismount-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (let ((f30-0 (lerp-scale 0.0 1.0 (ja-aframe-num 0) 33.0 41.0)))
           (quaternion-slerp!
@@ -797,7 +794,7 @@
       )
     0
     (logclear! (-> self nav state flags) (nav-state-flag at-target))
-    (ja-no-eval :group! (-> self draw art-group data 55) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! grunt-mech-dismount-land-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))

test/decompiler/reference/jak2/engine/target/mech/mech-states_REF.gc

@@ -99,16 +99,16 @@
     )
   :code (behavior ()
     (let ((v1-2 (ja-group)))
-      (when (not (and v1-2 (= v1-2 (-> self draw art-group data 327))))
+      (when (not (and v1-2 (= v1-2 jakb-mech-turn90-ja)))
         (let ((v1-8 (ja-group)))
-          (if (and v1-8 (= v1-8 (-> self draw art-group data 326)))
+          (if (and v1-8 (= v1-8 jakb-mech-walk-ja))
               (sound-play "mech-stop")
               )
           )
         (ja-channel-push! 3 (seconds 0.2))
-        (ja :group! (-> self draw art-group data 327) :dist 16384.0)
-        (ja :chan 1 :group! (-> self draw art-group data 332) :dist 3640.889)
-        (ja :chan 2 :group! (-> self draw art-group data 324) :dist 0.0)
+        (ja :group! jakb-mech-turn90-ja :dist 16384.0)
+        (ja :chan 1 :group! jakb-mech-turn20-ja :dist 3640.889)
+        (ja :chan 2 :group! jakb-mech-stance-ja :dist 0.0)
         )
       )
     (let ((f28-0 0.0)
@@ -211,8 +211,8 @@
     (let ((gp-0 (ja-group))
           (f0-2 (ja-aframe-num 0))
           )
-      (when (if (or (and (= gp-0 (-> self draw art-group data 326)) (>= f0-2 5.5) (>= 9.5 f0-2))
-                    (and (= gp-0 (-> self draw art-group data 326)) (>= f0-2 20.5) (>= 24.5 f0-2))
+      (when (if (or (and (= gp-0 jakb-mech-walk-ja) (>= f0-2 5.5) (>= 9.5 f0-2))
+                    (and (= gp-0 jakb-mech-walk-ja) (>= f0-2 20.5) (>= 24.5 f0-2))
                     )
                 #t
                 )
@@ -273,14 +273,14 @@
                    )
             (v1-7 (ja-group))
             )
-        (when (not (and v1-7 (= v1-7 (-> self draw art-group data 326))))
+        (when (not (and v1-7 (= v1-7 jakb-mech-walk-ja)))
           (ja-channel-push! 3 (seconds 0.1))
-          (ja :group! (-> self draw art-group data 326)
+          (ja :group! jakb-mech-walk-ja
               :num! (identity (ja-aframe f26-0 0))
               :dist (-> *TARGET-bank* mech-walk-cycle-dist)
               )
-          (ja :chan 1 :group! (-> self draw art-group data 325) :dist (-> *TARGET-bank* mech-run-cycle-dist))
-          (ja :chan 2 :group! (-> self draw art-group data 324) :dist 0.0)
+          (ja :chan 1 :group! jakb-mech-run-ja :dist (-> *TARGET-bank* mech-run-cycle-dist))
+          (ja :chan 2 :group! jakb-mech-stance-ja :dist 0.0)
           )
         )
       (until #f
@@ -393,7 +393,7 @@
       (cond
         ((zero? v1-26)
          (set! (-> self mech walk-anim-leg) 1)
-         (set! s5-0 (-> self draw art-group data 333))
+         (set! s5-0 jakb-mech-punch-l-ja)
          ((method-of-type impact-control initialize)
           (the-as impact-control (-> self mech state-impact))
           (the-as process-drawable (ppointer->process (-> self manipy)))
@@ -404,7 +404,7 @@
          )
         ((= v1-26 1)
          (set! (-> self mech walk-anim-leg) 0)
-         (set! s5-0 (-> self draw art-group data 334))
+         (set! s5-0 jakb-mech-punch-r-ja)
          ((method-of-type impact-control initialize)
           (the-as impact-control (-> self mech state-impact))
           (the-as process-drawable (ppointer->process (-> self manipy)))
@@ -415,7 +415,7 @@
          )
         ((= v1-26 2)
          (set! (-> self mech walk-anim-leg) 0)
-         (set! s5-0 (-> self draw art-group data 335))
+         (set! s5-0 jakb-mech-punch-b-ja)
          ((method-of-type impact-control initialize)
           (the-as impact-control (-> self mech state-impact))
           (the-as process-drawable (ppointer->process (-> self manipy)))
@@ -426,7 +426,7 @@
          )
         ((= v1-26 3)
          (set! (-> self mech walk-anim-leg) 0)
-         (set! s5-0 (-> self draw art-group data 353))
+         (set! s5-0 jakb-mech-punch-u-ja)
          ((method-of-type impact-control initialize)
           (the-as impact-control (-> self mech state-impact))
           (the-as process-drawable (ppointer->process (-> self manipy)))
@@ -586,10 +586,10 @@
         (compute-alignment! (-> self align))
         (when (and (not (focus-test? self dangerous))
                    (let ((v1-10 (ja-group)))
-                     (and v1-10 (or (= v1-10 (-> self draw art-group data 333))
-                                    (= v1-10 (-> self draw art-group data 334))
-                                    (= v1-10 (-> self draw art-group data 335))
-                                    (= v1-10 (-> self draw art-group data 353))
+                     (and v1-10 (or (= v1-10 jakb-mech-punch-l-ja)
+                                    (= v1-10 jakb-mech-punch-r-ja)
+                                    (= v1-10 jakb-mech-punch-b-ja)
+                                    (= v1-10 jakb-mech-punch-u-ja)
                                     )
                           )
                      )
@@ -602,29 +602,21 @@
           (let ((s3-0 (ja-group))
                 (f30-0 (ja-aframe-num 0))
                 )
-            (if (or (and (= s3-0 (-> self draw art-group data 333))
+            (if (or (and (= s3-0 jakb-mech-punch-l-ja)
                          (>= f30-0 2.0)
-                         (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 333)) frames num-frames) -1))
-                             (ja-frame-num 0)
-                             )
+                         (>= (the float (+ (-> (the-as art-joint-anim jakb-mech-punch-l-ja) frames num-frames) -1)) (ja-frame-num 0))
                          )
-                    (and (= s3-0 (-> self draw art-group data 334))
+                    (and (= s3-0 jakb-mech-punch-r-ja)
                          (>= f30-0 2.0)
-                         (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 334)) frames num-frames) -1))
-                             (ja-frame-num 0)
-                             )
+                         (>= (the float (+ (-> (the-as art-joint-anim jakb-mech-punch-r-ja) frames num-frames) -1)) (ja-frame-num 0))
                          )
-                    (and (= s3-0 (-> self draw art-group data 335))
+                    (and (= s3-0 jakb-mech-punch-b-ja)
                          (>= f30-0 2.0)
-                         (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 335)) frames num-frames) -1))
-                             (ja-frame-num 0)
-                             )
+                         (>= (the float (+ (-> (the-as art-joint-anim jakb-mech-punch-b-ja) frames num-frames) -1)) (ja-frame-num 0))
                          )
-                    (and (= s3-0 (-> self draw art-group data 353))
+                    (and (= s3-0 jakb-mech-punch-u-ja)
                          (>= f30-0 2.0)
-                         (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 353)) frames num-frames) -1))
-                             (ja-frame-num 0)
-                             )
+                         (>= (the float (+ (-> (the-as art-joint-anim jakb-mech-punch-u-ja) frames num-frames) -1)) (ja-frame-num 0))
                          )
                     )
                 (set! s5-0 #t)
@@ -635,29 +627,21 @@
           (let ((s3-1 (ja-group))
                 (f30-2 (ja-aframe-num 0))
                 )
-            (when (or (and (= s3-1 (-> self draw art-group data 333))
+            (when (or (and (= s3-1 jakb-mech-punch-l-ja)
                            (>= f30-2 21.0)
-                           (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 333)) frames num-frames) -1))
-                               (ja-frame-num 0)
-                               )
+                           (>= (the float (+ (-> (the-as art-joint-anim jakb-mech-punch-l-ja) frames num-frames) -1)) (ja-frame-num 0))
                            )
-                      (and (= s3-1 (-> self draw art-group data 334))
+                      (and (= s3-1 jakb-mech-punch-r-ja)
                            (>= f30-2 21.0)
-                           (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 334)) frames num-frames) -1))
-                               (ja-frame-num 0)
-                               )
+                           (>= (the float (+ (-> (the-as art-joint-anim jakb-mech-punch-r-ja) frames num-frames) -1)) (ja-frame-num 0))
                            )
-                      (and (= s3-1 (-> self draw art-group data 335))
+                      (and (= s3-1 jakb-mech-punch-b-ja)
                            (>= f30-2 21.0)
-                           (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 335)) frames num-frames) -1))
-                               (ja-frame-num 0)
-                               )
+                           (>= (the float (+ (-> (the-as art-joint-anim jakb-mech-punch-b-ja) frames num-frames) -1)) (ja-frame-num 0))
                            )
-                      (and (= s3-1 (-> self draw art-group data 353))
+                      (and (= s3-1 jakb-mech-punch-u-ja)
                            (>= f30-2 21.0)
-                           (>= (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 353)) frames num-frames) -1))
-                               (ja-frame-num 0)
-                               )
+                           (>= (the float (+ (-> (the-as art-joint-anim jakb-mech-punch-u-ja) frames num-frames) -1)) (ja-frame-num 0))
                            )
                       )
               (+! gp-0 1)
@@ -678,7 +662,7 @@
              (seek! (-> self mech forward-vel) -0.04096 (* 122880.0 (seconds-per-frame)))
              )
             ((let ((a0-43 (ja-group)))
-               (and a0-43 (or (= a0-43 (-> self draw art-group data 335)) (= a0-43 (-> self draw art-group data 353))))
+               (and a0-43 (or (= a0-43 jakb-mech-punch-b-ja) (= a0-43 jakb-mech-punch-u-ja)))
                )
              (cond
                ((< v1-142 (seconds 0.465))
@@ -695,7 +679,7 @@
             (else
               (let ((a0-50 (ja-group)))
                 (cond
-                  ((and a0-50 (= a0-50 (-> self draw art-group data 333)))
+                  ((and a0-50 (= a0-50 jakb-mech-punch-l-ja))
                    (cond
                      ((< v1-142 (seconds 0.465))
                       (seek! (-> self mech forward-vel) 0.0 (* 20480.0 (seconds-per-frame)))
@@ -781,7 +765,7 @@
     (let ((f0-0 (target-move-dist (-> *TARGET-bank* stuck-time)))
           (v1-9 (ja-group))
           )
-      (when (if (and (and v1-9 (= v1-9 (-> self draw art-group data 330)))
+      (when (if (and (and v1-9 (= v1-9 jakb-mech-jump-loop-ja))
                      (< f0-0 (-> *TARGET-bank* stuck-distance))
                      (and (time-elapsed? (-> self state-time) (seconds 2))
                           (not (and *cheat-mode* (cpad-hold? (-> self control cpad number) r2)))
@@ -856,9 +840,9 @@
       (cond
         ((< 0.0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))
          (let ((v1-7 (ja-group)))
-           (when (not (and v1-7 (= v1-7 (-> self draw art-group data 329))))
+           (when (not (and v1-7 (= v1-7 jakb-mech-jump-thrust-ja)))
              (ja-channel-push! 1 (seconds 0.1))
-             (ja :group! (-> self draw art-group data 329) :num! min)
+             (ja :group! jakb-mech-jump-thrust-ja :num! min)
              )
            )
          (suspend)
@@ -866,9 +850,9 @@
          )
         (else
           (let ((v1-22 (ja-group)))
-            (when (not (and v1-22 (= v1-22 (-> self draw art-group data 330))))
+            (when (not (and v1-22 (= v1-22 jakb-mech-jump-loop-ja)))
               (ja-channel-push! 1 (seconds 0.5))
-              (ja :group! (-> self draw art-group data 330) :num! min)
+              (ja :group! jakb-mech-jump-loop-ja :num! min)
               )
             )
           (suspend)
@@ -902,7 +886,7 @@
   :trans (-> target-mech-falling trans)
   :code (behavior ((arg0 float) (arg1 float) (arg2 surface))
     (let ((v1-2 (ja-group)))
-      (if (and v1-2 (= v1-2 (-> self draw art-group data 331)))
+      (if (and v1-2 (= v1-2 jakb-mech-jump-land-ja))
           (ja-channel-push! 1 (seconds 0.5))
           (ja-channel-push! 1 (seconds 0.05))
           )
@@ -1100,9 +1084,9 @@
         )
       (set! (-> self control mod-surface) *smack-mods*)
       (let ((v1-63 (ja-group)))
-        (when (not (and v1-63 (= v1-63 (-> self draw art-group data 348))))
+        (when (not (and v1-63 (= v1-63 jakb-mech-hit-front-ja)))
           (ja-channel-push! 1 (seconds 0.075))
-          (ja :group! (-> self draw art-group data 348) :num! min)
+          (ja :group! jakb-mech-hit-front-ja :num! min)
           )
         )
       (target-hit-move gp-0 (target-hit-orient gp-0 s5-0) target-mech-falling-anim-trans 1.0)
@@ -1207,10 +1191,10 @@
                )
              )
        (ja-channel-push! 1 (seconds 0.3))
-       (ja-no-eval :group! (-> self draw art-group data 330) :num! (loop! 0.5) :frame-num 0.0)
+       (ja-no-eval :group! jakb-mech-jump-loop-ja :num! (loop! 0.5) :frame-num 0.0)
        (let ((gp-3 (current-time)))
          (until (time-elapsed? gp-3 (seconds 0.8))
-           (ja :group! (-> self draw art-group data 330) :num! (loop! 0.5))
+           (ja :group! jakb-mech-jump-loop-ja :num! (loop! 0.5))
            (suspend)
            )
          )
@@ -1229,8 +1213,8 @@
                 )
               )
         (let ((gp-5 (if (zero? (rand-vu-int-count 2))
-                        (-> self draw art-group data 351)
-                        (-> self draw art-group data 352)
+                        jakb-mech-death-a-ja
+                        jakb-mech-death-b-ja
                         )
                     )
               )
@@ -1322,7 +1306,7 @@
         (set! (-> self alt-cam-pos quad) (-> self control trans quad))
         (set! (-> self post-hook) target-no-move-post)
         (ja-channel-set! 1)
-        (ja-no-eval :group! (-> self draw art-group data 70) :num! (seek!) :frame-num 0.0)
+        (ja-no-eval :group! jakb-death-painful-land-ja :num! (seek!) :frame-num 0.0)
         (until (ja-done? 0)
           (set! (-> self control transv quad) (the-as uint128 0))
           (vector-seek!
@@ -1477,17 +1461,13 @@
           (gp-0 #f)
           )
       (ja-channel-push! 2 1)
-      (ja :group! (-> self draw art-group data 337) :num! min)
+      (ja :group! jakb-mech-carry-pickup-high-ja :num! min)
       (let ((a0-2 (-> self skel root-channel 1)))
         (set! (-> a0-2 frame-interp 1) f30-0)
         (set! (-> a0-2 frame-interp 0) f30-0)
-        (set! (-> a0-2 frame-group) (the-as art-joint-anim (-> self draw art-group data 336)))
+        (set! (-> a0-2 frame-group) (the-as art-joint-anim jakb-mech-carry-pickup-low-ja))
         (set! (-> a0-2 param 0) 0.0)
-        (joint-control-channel-group-eval!
-          a0-2
-          (the-as art-joint-anim (-> self draw art-group data 336))
-          num-func-chan
-          )
+        (joint-control-channel-group-eval! a0-2 (the-as art-joint-anim jakb-mech-carry-pickup-low-ja) num-func-chan)
         )
       (suspend)
       (ja :num! (seek!))
@@ -1566,7 +1546,7 @@
       (cond
         (gp-0
           (ja-channel-push! 1 (seconds 0.01))
-          (ja-no-eval :group! (-> self draw art-group data 347) :num! (seek!) :frame-num 0.0)
+          (ja-no-eval :group! jakb-mech-drag-pickup-ja :num! (seek!) :frame-num 0.0)
           (until (ja-done? 0)
             (suspend)
             (ja :num! (seek!))
@@ -1720,17 +1700,13 @@
           )
         )
       (ja-channel-push! 2 (seconds 0.1))
-      (ja :group! (-> self draw art-group data 337) :num! max)
+      (ja :group! jakb-mech-carry-pickup-high-ja :num! max)
       (let ((a0-19 (-> self skel root-channel 1)))
         (set! (-> a0-19 frame-interp 1) f30-0)
         (set! (-> a0-19 frame-interp 0) f30-0)
-        (set! (-> a0-19 frame-group) (the-as art-joint-anim (-> self draw art-group data 336)))
+        (set! (-> a0-19 frame-group) (the-as art-joint-anim jakb-mech-carry-pickup-low-ja))
         (set! (-> a0-19 param 0) 0.0)
-        (joint-control-channel-group-eval!
-          a0-19
-          (the-as art-joint-anim (-> self draw art-group data 336))
-          num-func-chan
-          )
+        (joint-control-channel-group-eval! a0-19 (the-as art-joint-anim jakb-mech-carry-pickup-low-ja) num-func-chan)
         )
       (suspend)
       (ja-no-eval :num! (seek! (ja-aframe 8.0 0)))
@@ -1891,10 +1867,10 @@
     )
   :code (behavior ()
     (let ((v1-2 (ja-group)))
-      (when (not (and v1-2 (= v1-2 (-> self draw art-group data 344))))
+      (when (not (and v1-2 (= v1-2 jakb-mech-carry-turn45-ja)))
         (ja-channel-push! 2 (seconds 0.2))
-        (ja :group! (-> self draw art-group data 344) :dist 8192.0)
-        (ja :chan 1 :group! (-> self draw art-group data 338) :dist 0.0)
+        (ja :group! jakb-mech-carry-turn45-ja :dist 8192.0)
+        (ja :chan 1 :group! jakb-mech-carry-stance-ja :dist 0.0)
         )
       )
     (let ((f30-0 0.0))
@@ -1946,8 +1922,8 @@
     (let ((gp-0 (ja-group))
           (f0-0 (ja-aframe-num 0))
           )
-      (when (if (or (and (= gp-0 (-> self draw art-group data 339)) (>= f0-0 5.5) (>= 9.5 f0-0))
-                    (and (= gp-0 (-> self draw art-group data 339)) (>= f0-0 20.5) (>= 24.5 f0-0))
+      (when (if (or (and (= gp-0 jakb-mech-carry-walk-ja) (>= f0-0 5.5) (>= 9.5 f0-0))
+                    (and (= gp-0 jakb-mech-carry-walk-ja) (>= f0-0 20.5) (>= 24.5 f0-0))
                     )
                 #t
                 )
@@ -2000,13 +1976,13 @@
                    )
             (v1-7 (ja-group))
             )
-        (when (not (and v1-7 (= v1-7 (-> self draw art-group data 339))))
+        (when (not (and v1-7 (= v1-7 jakb-mech-carry-walk-ja)))
           (ja-channel-push! 2 (seconds 0.1))
-          (ja :group! (-> self draw art-group data 339)
+          (ja :group! jakb-mech-carry-walk-ja
               :num! (identity (ja-aframe f28-0 0))
               :dist (-> *TARGET-bank* mech-walk-cycle-dist)
               )
-          (ja :chan 1 :group! (-> self draw art-group data 338) :dist 0.0)
+          (ja :chan 1 :group! jakb-mech-carry-stance-ja :dist 0.0)
           )
         )
       (until #f
@@ -2150,61 +2126,60 @@
               )
           (if (and (nonzero? (-> self control sliding-start-time)) (< (-> self control sliding-start-time) (current-time)))
               (send-event self 'drop)
-              (set! f28-0
-                    (cond
-                      ((nonzero? (-> self control sliding-start-time))
-                       (let ((v1-17 (ja-group)))
-                         (when (not (and v1-17 (= v1-17 (-> self draw art-group data 345))))
-                           (let ((v1-23 (ja-group)))
-                             (if (and v1-23 (= v1-23 (-> self draw art-group data 346)))
-                                 (set! f26-0 (ja-aframe-num 0))
+              (set! f28-0 (cond
+                            ((nonzero? (-> self control sliding-start-time))
+                             (let ((v1-17 (ja-group)))
+                               (when (not (and v1-17 (= v1-17 jakb-mech-push-ja)))
+                                 (let ((v1-23 (ja-group)))
+                                   (if (and v1-23 (= v1-23 jakb-mech-pull-ja))
+                                       (set! f26-0 (ja-aframe-num 0))
+                                       )
+                                   )
+                                 (sound-play "mech-drag-push")
+                                 (ja-channel-push! 1 (seconds 0.3))
+                                 (ja :group! jakb-mech-push-ja :num! (identity (ja-aframe f26-0 0)) :dist 16384.0)
                                  )
+                               )
+                             (when (-> self control unknown-spool-anim00)
+                               (set! (-> self control unknown-word04) (the-as uint #f))
+                               (set! f28-0 32768.0)
+                               )
+                             (seek f28-0 0.0 (* 65536.0 (seconds-per-frame)))
                              )
-                           (sound-play "mech-drag-push")
-                           (ja-channel-push! 1 (seconds 0.3))
-                           (ja :group! (-> self draw art-group data 345) :num! (identity (ja-aframe f26-0 0)) :dist 16384.0)
-                           )
-                         )
-                       (when (-> self control unknown-spool-anim00)
-                         (set! (-> self control unknown-word04) (the-as uint #f))
-                         (set! f28-0 32768.0)
-                         )
-                       (seek f28-0 0.0 (* 65536.0 (seconds-per-frame)))
-                       )
-                      ((< 0.0 f0-2)
-                       (let ((v1-47 (ja-group)))
-                         (when (not (and v1-47 (= v1-47 (-> self draw art-group data 345))))
-                           (let ((v1-53 (ja-group)))
-                             (if (and v1-53 (= v1-53 (-> self draw art-group data 346)))
-                                 (set! f26-0 (ja-aframe-num 0))
+                            ((< 0.0 f0-2)
+                             (let ((v1-47 (ja-group)))
+                               (when (not (and v1-47 (= v1-47 jakb-mech-push-ja)))
+                                 (let ((v1-53 (ja-group)))
+                                   (if (and v1-53 (= v1-53 jakb-mech-pull-ja))
+                                       (set! f26-0 (ja-aframe-num 0))
+                                       )
+                                   )
+                                 (sound-play "mech-drag-push")
+                                 (ja-channel-push! 1 (seconds 0.3))
+                                 (ja :group! jakb-mech-push-ja :num! (identity (ja-aframe f26-0 0)) :dist 16384.0)
                                  )
+                               )
+                             (seek f28-0 49152.0 (* 24576.0 (seconds-per-frame)))
                              )
-                           (sound-play "mech-drag-push")
-                           (ja-channel-push! 1 (seconds 0.3))
-                           (ja :group! (-> self draw art-group data 345) :num! (identity (ja-aframe f26-0 0)) :dist 16384.0)
-                           )
-                         )
-                       (seek f28-0 49152.0 (* 24576.0 (seconds-per-frame)))
-                       )
-                      ((< f0-2 0.0)
-                       (let ((v1-71 (ja-group)))
-                         (when (not (and v1-71 (= v1-71 (-> self draw art-group data 346))))
-                           (let ((v1-77 (ja-group)))
-                             (if (and v1-77 (= v1-77 (-> self draw art-group data 345)))
-                                 (set! f26-0 (ja-aframe-num 0))
+                            ((< f0-2 0.0)
+                             (let ((v1-71 (ja-group)))
+                               (when (not (and v1-71 (= v1-71 jakb-mech-pull-ja)))
+                                 (let ((v1-77 (ja-group)))
+                                   (if (and v1-77 (= v1-77 jakb-mech-push-ja))
+                                       (set! f26-0 (ja-aframe-num 0))
+                                       )
+                                   )
+                                 (sound-play "mech-drag-pull")
+                                 (ja-channel-push! 1 (seconds 0.3))
+                                 (ja :group! jakb-mech-pull-ja :num! (identity (ja-aframe f26-0 0)) :dist 16384.0)
                                  )
+                               )
+                             (seek f28-0 -49152.0 (* 24576.0 (seconds-per-frame)))
                              )
-                           (sound-play "mech-drag-pull")
-                           (ja-channel-push! 1 (seconds 0.3))
-                           (ja :group! (-> self draw art-group data 346) :num! (identity (ja-aframe f26-0 0)) :dist 16384.0)
-                           )
-                         )
-                       (seek f28-0 -49152.0 (* 24576.0 (seconds-per-frame)))
-                       )
-                      (else
-                        (seek f28-0 0.0 (* 32768.0 (seconds-per-frame)))
-                        )
-                      )
+                            (else
+                              (seek f28-0 0.0 (* 32768.0 (seconds-per-frame)))
+                              )
+                            )
                     )
               )
           )
@@ -2244,7 +2219,7 @@
           (set! (-> self mech thruster-flame-width) (* 0.021428572 (-> self mech jump-thrust)))
           (set! (-> self mech thruster-flame-length) (* 0.028571429 (-> self mech jump-thrust)))
           (let ((v1-120 (ja-group)))
-            (if (and v1-120 (or (= v1-120 (-> self draw art-group data 345)) (= v1-120 (-> self draw art-group data 346))))
+            (if (and v1-120 (or (= v1-120 jakb-mech-push-ja) (= v1-120 jakb-mech-pull-ja)))
                 (ja :num! (loop! f26-1))
                 )
             )
@@ -2295,21 +2270,21 @@
   :code (behavior ()
     (let ((v1-2 (ja-group)))
       (cond
-        ((and v1-2 (= v1-2 (-> self draw art-group data 341)))
+        ((and v1-2 (= v1-2 jakb-mech-carry-jump-loop-ja))
          )
         (else
           (ja-channel-push! 1 (seconds 0.33))
-          (ja :group! (-> self draw art-group data 341))
+          (ja :group! jakb-mech-carry-jump-loop-ja)
           (while (!= (-> self skel root-channel 0) (-> self skel channel))
             (suspend)
             )
           )
         )
       )
-    (ja-no-eval :group! (-> self draw art-group data 341) :num! (loop!) :frame-num 0.0)
+    (ja-no-eval :group! jakb-mech-carry-jump-loop-ja :num! (loop!) :frame-num 0.0)
     (until #f
       (suspend)
-      (ja :group! (-> self draw art-group data 341) :num! (loop!))
+      (ja :group! jakb-mech-carry-jump-loop-ja :num! (loop!))
       )
     #f
     )
@@ -2375,7 +2350,7 @@
         )
     (if (and (!= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0)
              (let ((v1-26 (ja-group)))
-               (and (and v1-26 (= v1-26 (-> self draw art-group data 342))) (>= (ja-aframe-num 0) 30.0))
+               (and (and v1-26 (= v1-26 jakb-mech-carry-jump-land-ja)) (>= (ja-aframe-num 0) 30.0))
                )
              )
         (go target-mech-carry-walk)
@@ -2433,9 +2408,9 @@
     )
   :code (behavior ((arg0 float) (arg1 float) (arg2 symbol))
     (ja-channel-push! 1 (seconds 0.05))
-    (ja :group! (-> self draw art-group data 340) :num! min)
+    (ja :group! jakb-mech-carry-jump-ja :num! min)
     (suspend)
-    (ja :group! (-> self draw art-group data 340) :num! (+!))
+    (ja :group! jakb-mech-carry-jump-ja :num! (+!))
     (suspend)
     (until (ja-done? 0)
       (let ((f30-0 (vector-dot (-> self control dynam gravity-normal) (-> self control transv)))
@@ -2472,7 +2447,7 @@
   :exit (-> target-mech-carry-pickup exit)
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 343) :num! (seek! (ja-aframe 16.0 0)) :frame-num 0.0)
+    (ja-no-eval :group! jakb-mech-carry-throw-ja :num! (seek! (ja-aframe 16.0 0)) :frame-num 0.0)
     (until (ja-done? 0)
       (let ((a1-3 (new 'stack-no-clear 'event-message-block)))
         (set! (-> a1-3 from) (process->ppointer self))
@@ -2576,7 +2551,7 @@
       )
     (set! (-> self mech mech-scale quad) (-> self control scale quad))
     (set! (-> self mech stick-off) (the-as basic #t))
-    (ja-no-eval :group! (-> self draw art-group data 350) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! jakb-mech-get-on-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (let ((f30-0 (sin (lerp-scale 0.0 16384.0 (ja-aframe-num 0) 70.0 80.0))))
         (let ((f28-0 (lerp-scale 0.0 1.0 (ja-aframe-num 0) 70.0 80.0)))
@@ -2627,11 +2602,11 @@
     (send-event *camera* 'set-dist #f #f)
     (set! (-> self neck flex-blend) 0.0)
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 349) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! jakb-mech-get-off-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (when (< 51.0 (ja-aframe-num 0))
         (logior! (-> self state-flags) (state-flags sf6))
-        (vector<-cspace! (-> self alt-cam-pos) (-> self node-list data 36))
+        (vector<-cspace! (-> self alt-cam-pos) (joint-node-index jakb-lod0-jg Rankle))
         )
       (suspend)
       (ja :num! (seek!))
@@ -2648,7 +2623,7 @@
     (rot->dir-targ! (-> self control))
     (ja-post)
     (let ((gp-1 (new 'stack-no-clear 'vector)))
-      (vector<-cspace! gp-1 (-> self node-list data 3))
+      (vector<-cspace! gp-1 (joint-node-index jakb-lod0-jg main))
       (+! (-> gp-1 y) -9011.2)
       (move-to-point! (-> self control) gp-1)
       )

test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc

@@ -1192,7 +1192,7 @@
     (activate! *camera-smush-control* 819.2 15 75 1.0 0.9 (-> *display* camera-clock))
     (target-start-attack)
     (target-danger-set! 'bomb #f)
-    (set! sv-80 (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 18)))
+    (set! sv-80 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg sk_lhand)))
     (set! sv-84 (lambda :behavior target
                   ()
                   (set-vector! (-> self draw color-mult) 0.0 0.0 0.0 1.0)
@@ -1598,7 +1598,9 @@
       (set! sv-32 (-> self focus-search))
       (set! sv-40 0)
       (set! sv-48 0)
-      (set! sv-56 (the-as sphere (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 3))))
+      (set! sv-56
+            (the-as sphere (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg main)))
+            )
       (set! sv-60
             (new 'static 'array handle 128
               (new 'static 'handle)

test/decompiler/reference/jak2/engine/target/target-gun_REF.gc

@@ -1202,7 +1202,7 @@
                (>= (current-time) (-> self gun track-target-hold-time))
                )
       (target-gun-build-track-list)
-      (let ((t2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 8))))
+      (let ((t2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg neckB))))
         (+! (-> t2-0 y) 2048.0)
         (cond
           ((logtest? (surface-flag gun-strafe) (-> self control current-surface flags))

test/decompiler/reference/jak2/engine/target/target-handler_REF.gc

@@ -1347,7 +1347,7 @@
                         (-> self control)
                         (the-as uint 2)
                         )
-                       (-> self draw art-group data 104)
+                       jakb-pole-cycle-ja
                        )
                   (go target-pole-cycle (process->handle arg0))
                   )

test/decompiler/reference/jak2/engine/target/target-swim_REF.gc

@@ -291,7 +291,7 @@
              (spawn-ripples
                (-> self water)
                0.2
-               (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 39))
+               (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg Rtoes))
                0
                (vector-float*! (new 'stack-no-clear 'vector) (-> self control transv) 2.5)
                #f
@@ -302,7 +302,7 @@
              (spawn-ripples
                (-> self water)
                0.2
-               (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 32))
+               (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg Ltoes))
                0
                (vector-float*! (new 'stack-no-clear 'vector) (-> self control transv) 2.5)
                #f

test/decompiler/reference/jak2/engine/target/target-turret_REF.gc

@@ -2468,7 +2468,7 @@ This commonly includes things such as:
       )
     (set! (-> self control unknown-handle02) (-> self turret handle))
     (ja-channel-set! 1)
-    (ja :group! (-> self draw art-group data 359))
+    (ja :group! jakb-turret-stance-ja)
     (until v1-19
       (suspend)
       (can-play-stance-amibent?)
@@ -2538,7 +2538,7 @@ This commonly includes things such as:
         )
       )
     (set! (-> self alt-cam-pos quad) (-> self control camera-pos quad))
-    (ja-no-eval :group! (-> self draw art-group data 361) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! jakb-turret-get-on-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (let ((f30-0 (sin (lerp-scale 0.0 16384.0 (ja-aframe-num 0) 0.0 12.0))))
         (let ((f28-0 (lerp-scale 0.0 1.0 (ja-aframe-num 0) 0.0 12.0)))
@@ -2599,7 +2599,7 @@ This commonly includes things such as:
       (set! (-> self control unknown-vector40 quad) (-> gp-0 quad))
       )
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 360) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! jakb-turret-get-off-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (cond
         ((< (ja-aframe-num 0) 88.0)
@@ -2644,7 +2644,7 @@ This commonly includes things such as:
         )
       (rot->dir-targ! (-> self control))
       (if (< 86.0 (ja-aframe-num 0))
-          (vector<-cspace! (-> self alt-cam-pos) (-> self node-list data 36))
+          (vector<-cspace! (-> self alt-cam-pos) (joint-node-index jakb-lod0-jg Rankle))
           )
       (suspend)
       (ja :num! (seek!))
@@ -2652,7 +2652,7 @@ This commonly includes things such as:
     (rot->dir-targ! (-> self control))
     (ja-post)
     (let ((gp-4 (new 'stack-no-clear 'vector)))
-      (vector<-cspace! gp-4 (-> self node-list data 3))
+      (vector<-cspace! gp-4 (joint-node-index jakb-lod0-jg main))
       (+! (-> gp-4 y) -9011.2)
       (move-to-point! (-> self control) gp-4)
       )

test/decompiler/reference/jak2/engine/target/target2_REF.gc

@@ -1479,7 +1479,7 @@
   :exit (behavior ()
     (send-event (ppointer->process (-> self sidekick)) 'matrix 'normal)
     (send-event (ppointer->process (-> self sidekick)) 'shadow #t)
-    (let ((gp-0 (-> self node-list data 3))
+    (let ((gp-0 (joint-node-index jakb-lod0-jg main))
           (a1-2 (-> self control camera-pos))
           )
       (cond

test/decompiler/reference/jak2/engine/target/target_REF.gc

@@ -2405,7 +2405,7 @@
           (spawn-ripples
             (-> self water)
             0.6
-            (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 8))
+            (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index jakb-lod0-jg neckB))
             0
             (-> self control transv)
             #f

test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc

@@ -982,7 +982,7 @@ For example for an elevator pre-compute the distance between the first and last
       )
     )
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 12) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! krew-clone-birth-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -2801,8 +2801,8 @@ For example for an elevator pre-compute the distance between the first and last
           (let ((gp-6 (new 'stack-no-clear 'projectile-init-by-other-params)))
             (let ((s4-0 (new 'stack-no-clear 'vector)))
               (set! (-> s4-0 quad) (-> (get-trans a0-40 0) quad))
-              (let ((s2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 32)))
-                    (s5-2 (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 33)))
+              (let ((s2-0 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index krew-lowres-lod0-jg lightC)))
+                    (s5-2 (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index krew-lowres-lod0-jg lightEnd)))
                     )
                 (let ((s3-0 (new 'stack-no-clear 'vector)))
                   0.0
@@ -2959,7 +2959,7 @@ For example for an elevator pre-compute the distance between the first and last
       (suspend)
       )
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 15)
+    (ja-no-eval :group! krew-lowres-death-land-ja
                 :num! (seek! max (-> self clock time-adjust-ratio))
                 :frame-num 0.0
                 )

test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc

@@ -1204,7 +1204,7 @@ For example for an elevator pre-compute the distance between the first and last
        )
       (('reset)
        (when (nonzero? (-> self anim-index))
-         (ja-no-eval :group! (-> self draw art-group data 3) :num! min)
+         (ja-no-eval :group! cas-rot-bridge-section-one-ja :num! min)
          (set! (-> self anim-index) (the-as uint 0))
          (set! v0-0 (logclear (-> self mask) (process-mask sleep-code)))
          (set! (-> self mask) (the-as process-mask v0-0))
@@ -1223,14 +1223,14 @@ For example for an elevator pre-compute the distance between the first and last
            (when (or (= f0-0 10.0) (= f0-0 40.0) (= f0-0 50.0))
              (cond
                ((= f0-0 10.0)
-                (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+                (ja-no-eval :group! cas-rot-bridge-section-one-ja :num! (seek!) :frame-num 0.0)
                 (until (ja-done? 0)
                   (suspend)
                   (ja :num! (seek!))
                   )
                 )
                (else
-                 (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek! 0.0) :frame-num max)
+                 (ja-no-eval :group! cas-rot-bridge-section-one-reverse-ja :num! (seek! 0.0) :frame-num max)
                  (until (ja-done? 0)
                    (suspend)
                    (ja :num! (seek! 0.0))
@@ -1243,14 +1243,14 @@ For example for an elevator pre-compute the distance between the first and last
            (when (or (= f0-0 40.0) (= f0-0 50.0) (= f0-0 80.0) (= f0-0 90.0))
              (cond
                ((or (= f0-0 40.0) (= f0-0 50.0))
-                (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+                (ja-no-eval :group! cas-rot-bridge-section-two-ja :num! (seek!) :frame-num 0.0)
                 (until (ja-done? 0)
                   (suspend)
                   (ja :num! (seek!))
                   )
                 )
                (else
-                 (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek! 0.0) :frame-num max)
+                 (ja-no-eval :group! cas-rot-bridge-section-two-reverse-ja :num! (seek! 0.0) :frame-num max)
                  (until (ja-done? 0)
                    (suspend)
                    (ja :num! (seek! 0.0))
@@ -1263,14 +1263,14 @@ For example for an elevator pre-compute the distance between the first and last
            (when (or (= f0-0 80.0) (= f0-0 90.0) (= f0-0 120.0))
              (cond
                ((or (= f0-0 80.0) (= f0-0 90.0))
-                (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+                (ja-no-eval :group! cas-rot-bridge-section-three-ja :num! (seek!) :frame-num 0.0)
                 (until (ja-done? 0)
                   (suspend)
                   (ja :num! (seek!))
                   )
                 )
                (else
-                 (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! 0.0) :frame-num max)
+                 (ja-no-eval :group! cas-rot-bridge-section-three-reverse-ja :num! (seek! 0.0) :frame-num max)
                  (until (ja-done? 0)
                    (suspend)
                    (ja :num! (seek! 0.0))
@@ -1282,14 +1282,14 @@ For example for an elevator pre-compute the distance between the first and last
           ((= (-> self anim-index) 3)
            (cond
              ((= f0-0 10.0)
-              (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0)
+              (ja-no-eval :group! cas-rot-bridge-single-section-ja :num! (seek!) :frame-num 0.0)
               (until (ja-done? 0)
                 (suspend)
                 (ja :num! (seek!))
                 )
               )
              (else
-               (ja-no-eval :group! (-> self draw art-group data 10) :num! (seek! 0.0) :frame-num max)
+               (ja-no-eval :group! cas-rot-bridge-single-section-reverse-ja :num! (seek! 0.0) :frame-num max)
                (until (ja-done? 0)
                  (suspend)
                  (ja :num! (seek! 0.0))
@@ -1355,14 +1355,14 @@ For example for an elevator pre-compute the distance between the first and last
               (sound-play
                 "track-plat-loop"
                 :id (-> self sound-id)
-                :position (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 5))
+                :position (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index cas-rot-bridge-lod0-jg b))
                 )
               (set! (-> self sound-flag) #t)
               )
              ((-> self sound-flag)
               (sound-play
                 "track-plat-stop"
-                :position (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 5))
+                :position (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index cas-rot-bridge-lod0-jg b))
                 )
               (sound-stop (-> self sound-id))
               (set! (-> self sound-flag) #f)
@@ -1375,14 +1375,14 @@ For example for an elevator pre-compute the distance between the first and last
                (sound-play
                  "track-plat-loop"
                  :id (-> self sound-id)
-                 :position (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 5))
+                 :position (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index cas-rot-bridge-lod0-jg b))
                  )
                (set! (-> self sound-flag) #t)
                )
               ((-> self sound-flag)
                (sound-play
                  "track-plat-stop"
-                 :position (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 5))
+                 :position (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index cas-rot-bridge-lod0-jg b))
                  )
                (sound-stop (-> self sound-id))
                (set! (-> self sound-flag) #f)
@@ -1991,7 +1991,7 @@ This commonly includes things such as:
 (defstate drop (cas-chain-plat)
   :virtual #t
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! cas-chain-plat-drop-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -2132,7 +2132,7 @@ This commonly includes things such as:
     (sound-play
       "cas-arm-blade"
       :id (-> self sound-id)
-      :position (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 4))
+      :position (vector<-cspace! (new 'stack-no-clear 'vector) (joint-node-index cas-rot-blade-lod0-jg blade))
       )
     )
   :code (behavior ()
@@ -2483,7 +2483,7 @@ This commonly includes things such as:
     )
   :code (behavior ()
     (sound-play "robo-hatch-open")
-    (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! cas-robot-door-idle-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (transform-post)
       (suspend)
@@ -2620,7 +2620,7 @@ This commonly includes things such as:
         )
       )
     (sound-play "robo-hatch-cls")
-    (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! 0.0) :frame-num max)
+    (ja-no-eval :group! cas-robot-door-idle-ja :num! (seek! 0.0) :frame-num max)
     (until (ja-done? 0)
       (transform-post)
       (suspend)
@@ -2648,7 +2648,7 @@ This commonly includes things such as:
   :code (behavior ()
     (local-vars (v1-28 symbol))
     (sound-play "robo-hatch-cls")
-    (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek! 0.0) :frame-num max)
+    (ja-no-eval :group! cas-robot-door-idle-ja :num! (seek! 0.0) :frame-num max)
     (until (ja-done? 0)
       (transform-post)
       (suspend)

test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc

@@ -405,9 +405,9 @@
     )
   :code (behavior ()
     (let ((a0-0 (-> self skel root-channel 0)))
-      (set! (-> a0-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 9)))
+      (set! (-> a0-0 frame-group) (the-as art-joint-anim roboguard-idle-to-ball-ja))
       (set! (-> a0-0 frame-num) 3.0)
-      (joint-control-channel-group! a0-0 (the-as art-joint-anim (-> self draw art-group data 9)) num-func-identity)
+      (joint-control-channel-group! a0-0 (the-as art-joint-anim roboguard-idle-to-ball-ja) num-func-identity)
       )
     (until (logtest? (-> self root status) (collide-status on-surface))
       (nav-enemy-falling-post)
@@ -441,65 +441,47 @@
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.1))
     (until #f
-      (ja-no-eval :group! (-> self draw art-group data 4)
-                  :num! (seek! 2.0 (rand-vu-float-range 0.1 0.15))
-                  :frame-num 0.0
-                  )
+      (ja-no-eval :group! roboguard-idle0-ja :num! (seek! 2.0 (rand-vu-float-range 0.1 0.15)) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! 2.0 (rand-vu-float-range 0.1 0.15)))
         )
-      (ja-no-eval :group! (-> self draw art-group data 4)
-                  :num! (seek! 3.0 (rand-vu-float-range 0.1 0.15))
-                  :frame-num 2.0
-                  )
+      (ja-no-eval :group! roboguard-idle0-ja :num! (seek! 3.0 (rand-vu-float-range 0.1 0.15)) :frame-num 2.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! 3.0 (rand-vu-float-range 0.1 0.15)))
         )
-      (ja-no-eval :group! (-> self draw art-group data 4)
-                  :num! (seek! 4.0 (rand-vu-float-range 0.1 0.15))
-                  :frame-num 3.0
-                  )
+      (ja-no-eval :group! roboguard-idle0-ja :num! (seek! 4.0 (rand-vu-float-range 0.1 0.15)) :frame-num 3.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! 4.0 (rand-vu-float-range 0.1 0.15)))
         )
-      (ja-no-eval :group! (-> self draw art-group data 4)
-                  :num! (seek! 5.0 (rand-vu-float-range 0.1 0.15))
-                  :frame-num 4.0
-                  )
+      (ja-no-eval :group! roboguard-idle0-ja :num! (seek! 5.0 (rand-vu-float-range 0.1 0.15)) :frame-num 4.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! 5.0 (rand-vu-float-range 0.1 0.15)))
         )
-      (ja-no-eval :group! (-> self draw art-group data 4)
-                  :num! (seek! 6.0 (rand-vu-float-range 0.1 0.15))
-                  :frame-num 5.0
-                  )
+      (ja-no-eval :group! roboguard-idle0-ja :num! (seek! 6.0 (rand-vu-float-range 0.1 0.15)) :frame-num 5.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! 6.0 (rand-vu-float-range 0.1 0.15)))
         )
-      (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek! 7.0 0.07) :frame-num 6.0)
+      (ja-no-eval :group! roboguard-idle0-ja :num! (seek! 7.0 0.07) :frame-num 6.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! 7.0 0.07))
         )
-      (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek! 8.0 0.07) :frame-num 7.0)
+      (ja-no-eval :group! roboguard-idle0-ja :num! (seek! 8.0 0.07) :frame-num 7.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! 8.0 0.07))
         )
-      (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek! 9.0 0.07) :frame-num 8.0)
+      (ja-no-eval :group! roboguard-idle0-ja :num! (seek! 9.0 0.07) :frame-num 8.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! 9.0 0.07))
         )
-      (ja-no-eval :group! (-> self draw art-group data 4)
-                  :num! (seek! 10.0 (rand-vu-float-range 0.02 0.05))
-                  :frame-num 9.0
-                  )
+      (ja-no-eval :group! roboguard-idle0-ja :num! (seek! 10.0 (rand-vu-float-range 0.02 0.05)) :frame-num 9.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! 10.0 (rand-vu-float-range 0.02 0.05)))
@@ -531,7 +513,7 @@
     (ja-channel-push! 1 (seconds 0.2))
     (let ((f30-0 (get-rand-float-range self 0.9 1.1)))
       (until #f
-        (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek! 10.0 (* 0.1 f30-0)) :frame-num 9.0)
+        (ja-no-eval :group! roboguard-idle0-ja :num! (seek! 10.0 (* 0.1 f30-0)) :frame-num 9.0)
         (until (ja-done? 0)
           (suspend)
           (ja :num! (seek! 10.0 (* 0.1 f30-0)))
@@ -551,7 +533,7 @@
     (logand! (-> self flags) -9)
     )
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! roboguard-idle-to-ball-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -708,7 +690,7 @@
         )
     )
   :code (behavior ()
-    (ja :group! (-> self draw art-group data 10))
+    (ja :group! roboguard-ball-ja)
     (until #f
       (let ((a0-3 (-> self skel root-channel 0)))
         (let ((f0-0 0.000024414063)
@@ -735,7 +717,7 @@
     '()
     )
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 27) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! roboguard-ball-to-dizzy-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (when (< 17.0 (ja-aframe-num 0))
         (logand! (-> self flags) -5)
@@ -768,7 +750,7 @@
     )
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 28) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! roboguard-dizzy-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -798,7 +780,7 @@
     )
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.075))
-    (ja-no-eval :group! (-> self draw art-group data 12)
+    (ja-no-eval :group! roboguard-death-standing-ja
                 :num! (seek! (ja-aframe 20.0 0))
                 :frame-num (ja-aframe 13.0 0)
                 )
@@ -806,7 +788,7 @@
       (suspend)
       (ja :num! (seek! (ja-aframe 20.0 0)))
       )
-    (ja-no-eval :group! (-> self draw art-group data 12)
+    (ja-no-eval :group! roboguard-death-standing-ja
                 :num! (seek! (ja-aframe 25.0 0) 0.5)
                 :frame-num (ja-aframe 20.0 0)
                 )
@@ -814,7 +796,7 @@
       (suspend)
       (ja :num! (seek! (ja-aframe 25.0 0) 0.5))
       )
-    (ja-no-eval :group! (-> self draw art-group data 12)
+    (ja-no-eval :group! roboguard-death-standing-ja
                 :num! (seek! (ja-aframe 26.0 0))
                 :frame-num (ja-aframe 25.0 0)
                 )

test/decompiler/reference/jak2/levels/city/common/pilot-states_REF.gc

@@ -22,9 +22,9 @@
 ;; WARN: new jak 2 until loop case, check carefully
 (defbehavior target-pilot-bike-anim-loop target ()
   (ja-channel-push! 3 (seconds 0.1))
-  (ja :group! (-> self draw art-group data 210))
-  (ja :chan 1 :group! (-> self draw art-group data 209))
-  (ja :chan 2 :group! (-> self draw art-group data 214))
+  (ja :group! jakb-pilot-bike-turn-back-ja)
+  (ja :chan 1 :group! jakb-pilot-bike-turn-front-ja)
+  (ja :chan 2 :group! jakb-pilot-bike-up-down-ja)
   (until #f
     (let ((gp-0 (-> self pilot)))
       (let ((f30-0 (* 5.0 (- 1.0 (-> gp-0 left-right-interp)))))
@@ -61,9 +61,9 @@
 ;; WARN: new jak 2 until loop case, check carefully
 (defbehavior target-pilot-car-anim-loop target ()
   (ja-channel-push! 3 (seconds 0.1))
-  (ja :group! (-> self draw art-group data 203))
-  (ja :chan 1 :group! (-> self draw art-group data 202))
-  (ja :chan 2 :group! (-> self draw art-group data 213))
+  (ja :group! jakb-pilot-car-turn-back-ja)
+  (ja :chan 1 :group! jakb-pilot-car-turn-front-ja)
+  (ja :chan 2 :group! jakb-pilot-car-up-down-ja)
   (until #f
     (let ((gp-0 (-> self pilot)))
       (let ((f30-0 (* 5.0 (+ 1.0 (-> gp-0 left-right-interp)))))
@@ -364,35 +364,35 @@
                (let ((v1-131 s5-0))
                  (cond
                    ((= v1-131 4)
-                    (ja-no-eval :group! (-> self draw art-group data 232) :num! (seek!) :frame-num 0.0)
+                    (ja-no-eval :group! jakb-pilot-bike-smack-left-ja :num! (seek!) :frame-num 0.0)
                     (until (ja-done? 0)
                       (suspend)
                       (ja :num! (seek!))
                       )
                     )
                    ((= v1-131 5)
-                    (ja-no-eval :group! (-> self draw art-group data 233) :num! (seek!) :frame-num 0.0)
+                    (ja-no-eval :group! jakb-pilot-bike-smack-right-ja :num! (seek!) :frame-num 0.0)
                     (until (ja-done? 0)
                       (suspend)
                       (ja :num! (seek!))
                       )
                     )
                    ((zero? v1-131)
-                    (ja-no-eval :group! (-> self draw art-group data 211) :num! (seek!) :frame-num (ja-aframe 0.0 0))
+                    (ja-no-eval :group! jakb-pilot-bike-smack-front-ja :num! (seek!) :frame-num (ja-aframe 0.0 0))
                     (until (ja-done? 0)
                       (suspend)
                       (ja :num! (seek!))
                       )
                     )
                    ((= v1-131 1)
-                    (ja-no-eval :group! (-> self draw art-group data 212) :num! (seek!) :frame-num (ja-aframe 0.0 0))
+                    (ja-no-eval :group! jakb-pilot-bike-smack-back-ja :num! (seek!) :frame-num (ja-aframe 0.0 0))
                     (until (ja-done? 0)
                       (suspend)
                       (ja :num! (seek!))
                       )
                     )
                    (else
-                     (ja-no-eval :group! (-> self draw art-group data 215) :num! (seek!) :frame-num (ja-aframe 0.0 0))
+                     (ja-no-eval :group! jakb-pilot-bike-smack-shock-ja :num! (seek!) :frame-num (ja-aframe 0.0 0))
                      (until (ja-done? 0)
                        (suspend)
                        (ja :num! (seek!))
@@ -402,35 +402,35 @@
                  )
                )
               ((begin (ja-channel-push! 1 (seconds 0.05)) (set! v1-252 s5-0) (= v1-252 4))
-               (ja-no-eval :group! (-> self draw art-group data 234) :num! (seek!) :frame-num 0.0)
+               (ja-no-eval :group! jakb-pilot-car-smack-left-ja :num! (seek!) :frame-num 0.0)
                (until (ja-done? 0)
                  (suspend)
                  (ja :num! (seek!))
                  )
                )
               ((= v1-252 5)
-               (ja-no-eval :group! (-> self draw art-group data 235) :num! (seek!) :frame-num 0.0)
+               (ja-no-eval :group! jakb-pilot-car-smack-right-ja :num! (seek!) :frame-num 0.0)
                (until (ja-done? 0)
                  (suspend)
                  (ja :num! (seek!))
                  )
                )
               ((zero? v1-252)
-               (ja-no-eval :group! (-> self draw art-group data 204) :num! (seek! max 1.3) :frame-num (ja-aframe 4.0 0))
+               (ja-no-eval :group! jakb-pilot-car-smack-front-ja :num! (seek! max 1.3) :frame-num (ja-aframe 4.0 0))
                (until (ja-done? 0)
                  (suspend)
                  (ja :num! (seek! max 1.3))
                  )
                )
               ((= v1-252 1)
-               (ja-no-eval :group! (-> self draw art-group data 205) :num! (seek!) :frame-num (ja-aframe 2.0 0))
+               (ja-no-eval :group! jakb-pilot-car-smack-back-ja :num! (seek!) :frame-num (ja-aframe 2.0 0))
                (until (ja-done? 0)
                  (suspend)
                  (ja :num! (seek!))
                  )
                )
               (else
-                (ja-no-eval :group! (-> self draw art-group data 208) :num! (seek!) :frame-num (ja-aframe 0.0 0))
+                (ja-no-eval :group! jakb-pilot-car-smack-shock-ja :num! (seek!) :frame-num (ja-aframe 0.0 0))
                 (until (ja-done? 0)
                   (suspend)
                   (ja :num! (seek!))
@@ -481,8 +481,8 @@
     (logior! (-> self state-flags) (state-flags sf6))
     (set! (-> self alt-cam-pos quad) (-> self control camera-pos quad))
     (let ((gp-0 (if (zero? (-> self pilot stance))
-                    (-> self draw art-group data 201)
-                    (-> self draw art-group data 200)
+                    jakb-pilot-bike-get-on-ja
+                    jakb-pilot-car-get-on-ja
                     )
                 )
           )
@@ -585,11 +585,11 @@
     (let ((gp-0 (cond
                   ((zero? (-> self pilot stance))
                    (set! f30-0 7.2)
-                   (-> self draw art-group data 216)
+                   jakb-pilot-bike-get-off-ja
                    )
                   (else
                     (set! f30-0 15.2)
-                    (-> self draw art-group data 199)
+                    jakb-pilot-car-get-off-ja
                     )
                   )
                 )

test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc

@@ -1504,7 +1504,7 @@ This commonly includes things such as:
   :enter (behavior ()
     (try-update-focus (-> self focus) *target*)
     (ja-channel-push! 1 0)
-    (ja-no-eval :group! (-> self draw art-group data 2) :num! zero)
+    (ja-no-eval :group! cty-guard-turret-idle-ja :num! zero)
     (transform-post)
     (logior! (-> self focus-status) (focus-status ignore))
     )
@@ -1660,7 +1660,7 @@ This commonly includes things such as:
     (set! (-> self root root-prim specific 0) (+ (-> self root root-prim specific 1) -1))
     )
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! 20.0) :frame-num 20.0)
+    (ja-no-eval :group! cty-guard-turret-pop-up-down-ja :num! (seek! 20.0) :frame-num 20.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek! 20.0))
@@ -1737,7 +1737,7 @@ This commonly includes things such as:
     (set! (-> self button-down?) #f)
     )
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 3)
+    (ja-no-eval :group! cty-guard-turret-pop-up-down-ja
                 :num! (seek! (ja-aframe 20.0 0))
                 :frame-num (ja-aframe 20.0 0)
                 )
@@ -1748,7 +1748,7 @@ This commonly includes things such as:
     (while (not (-> self button-down?))
       (suspend)
       )
-    (ja-no-eval :group! (-> self draw art-group data 3)
+    (ja-no-eval :group! cty-guard-turret-pop-up-down-ja
                 :num! (seek! (ja-aframe 32.0 0))
                 :frame-num (ja-aframe 20.0 0)
                 )
@@ -1988,7 +1988,7 @@ This commonly includes things such as:
     '()
     )
   :code (behavior ()
-    (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! 20.0 0.5) :frame-num 0.0)
+    (ja-no-eval :group! cty-guard-turret-pop-up-down-ja :num! (seek! 20.0 0.5) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek! 20.0 0.5))
@@ -2043,7 +2043,7 @@ This commonly includes things such as:
       )
     #f
     (label cfg-36)
-    (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! 32.0 0.5) :frame-num 20.0)
+    (ja-no-eval :group! cty-guard-turret-pop-up-down-ja :num! (seek! 32.0 0.5) :frame-num 20.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek! 32.0 0.5))

test/decompiler/reference/jak2/levels/city/farm/ctyfarm-obs_REF.gc

@@ -1142,7 +1142,7 @@
                           (set! (-> v1-10 0 amplitude) 1820.4445)
                           (set! (-> v1-10 0 y-amplitude) 0.0)
                           )
-                        (let ((a0-17 (-> self node-list data 6)))
+                        (let ((a0-17 (joint-node-index farm-marrow-lod0-jg marrow_a)))
                           (set! (-> a0-17 param0) farm-marrow-callback)
                           (set! (-> a0-17 param1) self)
                           (set! (-> a0-17 param2) (the-as basic 0))
@@ -1155,7 +1155,7 @@
                           (set! (-> v1-13 amplitude) 1820.4445)
                           (set! (-> v1-13 y-amplitude) 0.0)
                           )
-                        (let ((v1-15 (-> self node-list data 7)))
+                        (let ((v1-15 (joint-node-index farm-marrow-lod0-jg marrow_b)))
                           (set! (-> v1-15 param0) farm-marrow-callback)
                           (set! (-> v1-15 param1) self)
                           (set! (-> v1-15 param2) (the-as basic 1))
@@ -1168,7 +1168,7 @@
                           (set! (-> v1-16 amplitude) 1820.4445)
                           (set! (-> v1-16 y-amplitude) 0.0)
                           )
-                        (let ((v1-18 (-> self node-list data 8)))
+                        (let ((v1-18 (joint-node-index farm-marrow-lod0-jg marrow_c)))
                           (set! (-> v1-18 param0) farm-marrow-callback)
                           (set! (-> v1-18 param1) self)
                           (set! (-> v1-18 param2) (the-as basic 2))
@@ -1183,7 +1183,7 @@
                           (set! (-> v1-19 y-freq) 150.0)
                           (set! (-> v1-19 y-amplitude) -1820.4445)
                           )
-                        (let ((v1-21 (-> self node-list data 4)))
+                        (let ((v1-21 (joint-node-index farm-marrow-lod0-jg leaves_a)))
                           (set! (-> v1-21 param0) farm-marrow-callback)
                           (set! (-> v1-21 param1) self)
                           (set! (-> v1-21 param2) (the-as basic 3))
@@ -1197,7 +1197,7 @@
                           (set! (-> v1-22 y-amplitude) 0.0)
                           )
                         )
-                      (let ((v0-0 (the-as object (-> self node-list data 5))))
+                      (let ((v0-0 (the-as object (joint-node-index farm-marrow-lod0-jg leaves_b))))
                         (set! (-> (the-as cspace v0-0) param0) farm-marrow-callback)
                         (set! (-> (the-as cspace v0-0) param1) self)
                         (set! (-> (the-as cspace v0-0) param2) (the-as basic 4))
@@ -1459,7 +1459,7 @@ This commonly includes things such as:
                           (set! (-> v1-10 0 amplitude) 1820.4445)
                           (set! (-> v1-10 0 y-amplitude) 0.0)
                           )
-                        (let ((a0-17 (-> self node-list data 4)))
+                        (let ((a0-17 (joint-node-index farm-beetree-lod0-jg bulb)))
                           (set! (-> a0-17 param0) farm-beetree-callback)
                           (set! (-> a0-17 param1) self)
                           (set! (-> a0-17 param2) (the-as basic 0))
@@ -1475,7 +1475,7 @@ This commonly includes things such as:
                           (set! (-> v1-13 y-amplitude) 3640.889)
                           )
                         )
-                      (let ((v0-0 (the-as object (-> self node-list data 5))))
+                      (let ((v0-0 (the-as object (joint-node-index farm-beetree-lod0-jg leaves))))
                         (set! (-> (the-as cspace v0-0) param0) farm-beetree-callback)
                         (set! (-> (the-as cspace v0-0) param1) self)
                         (set! (-> (the-as cspace v0-0) param2) (the-as basic 1))
@@ -1731,7 +1731,7 @@ This commonly includes things such as:
                           (set! (-> v1-10 0 amplitude) 1820.4445)
                           (set! (-> v1-10 0 y-amplitude) 0.0)
                           )
-                        (let ((a0-17 (-> self node-list data 4)))
+                        (let ((a0-17 (joint-node-index farm-cabbage-lod0-jg cabbage)))
                           (set! (-> a0-17 param0) farm-cabbage-callback)
                           (set! (-> a0-17 param1) self)
                           (set! (-> a0-17 param2) (the-as basic 0))
@@ -1747,7 +1747,7 @@ This commonly includes things such as:
                           (set! (-> v1-13 y-amplitude) 910.2222)
                           )
                         )
-                      (let ((v0-0 (the-as object (-> self node-list data 5))))
+                      (let ((v0-0 (the-as object (joint-node-index farm-cabbage-lod0-jg leaves))))
                         (set! (-> (the-as cspace v0-0) param0) farm-cabbage-callback)
                         (set! (-> (the-as cspace v0-0) param1) self)
                         (set! (-> (the-as cspace v0-0) param2) (the-as basic 1))
@@ -2006,7 +2006,7 @@ This commonly includes things such as:
                           (set! (-> v1-10 0 y-amplitude) 0.0)
                           )
                         )
-                      (let ((v0-0 (the-as object (-> self node-list data 4))))
+                      (let ((v0-0 (the-as object (joint-node-index farm-small-cabbage-lod0-jg cabbage))))
                         (set! (-> (the-as cspace v0-0) param0) farm-small-cabbage-callback)
                         (set! (-> (the-as cspace v0-0) param1) self)
                         (set! (-> (the-as cspace v0-0) param2) (the-as basic 0))
@@ -2264,7 +2264,7 @@ This commonly includes things such as:
                           (set! (-> v1-10 0 amplitude) 1820.4445)
                           (set! (-> v1-10 0 y-amplitude) 0.0)
                           )
-                        (let ((a0-17 (-> self node-list data 4)))
+                        (let ((a0-17 (joint-node-index farm-chilirots-lod0-jg chili_a)))
                           (set! (-> a0-17 param0) farm-chilirots-callback)
                           (set! (-> a0-17 param1) self)
                           (set! (-> a0-17 param2) (the-as basic 0))
@@ -2279,7 +2279,7 @@ This commonly includes things such as:
                           (set! (-> v1-13 y-freq) 150.0)
                           (set! (-> v1-13 y-amplitude) 1820.4445)
                           )
-                        (let ((v1-15 (-> self node-list data 5)))
+                        (let ((v1-15 (joint-node-index farm-chilirots-lod0-jg chili_b)))
                           (set! (-> v1-15 param0) farm-chilirots-callback)
                           (set! (-> v1-15 param1) self)
                           (set! (-> v1-15 param2) (the-as basic 1))
@@ -2294,7 +2294,7 @@ This commonly includes things such as:
                           (set! (-> v1-16 y-freq) 150.0)
                           (set! (-> v1-16 y-amplitude) 1820.4445)
                           )
-                        (let ((v1-18 (-> self node-list data 6)))
+                        (let ((v1-18 (joint-node-index farm-chilirots-lod0-jg chili_c)))
                           (set! (-> v1-18 param0) farm-chilirots-callback)
                           (set! (-> v1-18 param1) self)
                           (set! (-> v1-18 param2) (the-as basic 2))
@@ -2310,7 +2310,7 @@ This commonly includes things such as:
                           (set! (-> v1-19 y-amplitude) 1820.4445)
                           )
                         )
-                      (let ((v0-0 (the-as object (-> self node-list data 7))))
+                      (let ((v0-0 (the-as object (joint-node-index farm-chilirots-lod0-jg chili_d))))
                         (set! (-> (the-as cspace v0-0) param0) farm-chilirots-callback)
                         (set! (-> (the-as cspace v0-0) param1) self)
                         (set! (-> (the-as cspace v0-0) param2) (the-as basic 3))
@@ -2465,7 +2465,7 @@ This commonly includes things such as:
   :virtual #t
   :code (behavior ()
     (until #f
-      (ja-no-eval :group! (-> self draw art-group data 2) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! farm-sprinkler-barrels-idle-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))

test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc-states_REF.gc

@@ -51,7 +51,7 @@
             ((zero? v1-7)
              (let ((v1-10 (ja-group)))
                (cond
-                 ((and v1-10 (= v1-10 (-> self draw art-group data 3)))
+                 ((and v1-10 (= v1-10 crocadog-escort-idle-pant-ja))
                   (ja-no-eval :num! (seek! max 0.5))
                   (while (not (ja-done? 0))
                     (suspend)
@@ -65,7 +65,7 @@
                )
              (let ((s5-0 (get-rand-int-range self 3 7)))
                (dotimes (s4-0 s5-0)
-                 (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.5) :frame-num 0.0)
+                 (ja-no-eval :group! crocadog-escort-idle-pant-ja :num! (seek! max 0.5) :frame-num 0.0)
                  (until (ja-done? 0)
                    (suspend)
                    (ja :num! (seek! max 0.5))
@@ -75,12 +75,12 @@
              )
             ((= v1-7 1)
              (ja-channel-push! 1 (seconds 0.1))
-             (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek! (ja-aframe 3.0 0) 0.5) :frame-num 0.0)
+             (ja-no-eval :group! crocadog-escort-idle-bark-ja :num! (seek! (ja-aframe 3.0 0) 0.5) :frame-num 0.0)
              (until (ja-done? 0)
                (suspend)
                (ja :num! (seek! (ja-aframe 3.0 0) 0.5))
                )
-             (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek! max 0.33) :frame-num (ja-aframe 3.0 0))
+             (ja-no-eval :group! crocadog-escort-idle-bark-ja :num! (seek! max 0.33) :frame-num (ja-aframe 3.0 0))
              (until (ja-done? 0)
                (suspend)
                (ja :num! (seek! max 0.33))
@@ -89,7 +89,7 @@
             ((= v1-7 2)
              (let ((v1-90 (ja-group)))
                (cond
-                 ((and v1-90 (= v1-90 (-> self draw art-group data 5)))
+                 ((and v1-90 (= v1-90 crocadog-escort-idle-scratch-ja))
                   (ja-no-eval :num! (seek! max 0.5))
                   (while (not (ja-done? 0))
                     (suspend)
@@ -103,7 +103,7 @@
                )
              (let ((s5-4 (get-rand-int-range self 5 7)))
                (dotimes (s4-1 s5-4)
-                 (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek! max 0.5) :frame-num (ja-aframe 2.0 0))
+                 (ja-no-eval :group! crocadog-escort-idle-scratch-ja :num! (seek! max 0.5) :frame-num (ja-aframe 2.0 0))
                  (until (ja-done? 0)
                    (suspend)
                    (ja :num! (seek! max 0.5))
@@ -114,7 +114,7 @@
             (else
               (let ((v1-132 (ja-group)))
                 (cond
-                  ((and v1-132 (= v1-132 (-> self draw art-group data 4)))
+                  ((and v1-132 (= v1-132 crocadog-escort-idle-wag-ja))
                    (ja-no-eval :num! (seek!))
                    (while (not (ja-done? 0))
                      (suspend)
@@ -128,7 +128,7 @@
                 )
               (let ((s5-5 (get-rand-int-range self 3 7)))
                 (dotimes (s4-2 s5-5)
-                  (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+                  (ja-no-eval :group! crocadog-escort-idle-wag-ja :num! (seek!) :frame-num 0.0)
                   (until (ja-done? 0)
                     (suspend)
                     (ja :num! (seek!))
@@ -176,7 +176,7 @@
     )
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! crocadog-escort-turn0-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -392,7 +392,7 @@
     (local-vars (sv-128 float))
     (ja-channel-push! 1 (seconds 0.1))
     (let ((gp-0 (new 'stack-no-clear 'matrix)))
-      (ja-no-eval :group! (-> self draw art-group data 10)
+      (ja-no-eval :group! crocadog-escort-jump-in-vehicle-ja
                   :num! (seek! (ja-aframe 1.0 0) 0.5)
                   :frame-num (ja-aframe 0.0 0)
                   )
@@ -403,7 +403,7 @@
       (let ((s5-2 (new 'stack-no-clear 'vector)))
         (set! (-> s5-2 quad) (-> self root trans quad))
         (let ((s4-0 (quaternion-copy! (new 'stack-no-clear 'quaternion) (-> self root quat))))
-          (ja-no-eval :group! (-> self draw art-group data 10)
+          (ja-no-eval :group! crocadog-escort-jump-in-vehicle-ja
                       :num! (seek! (ja-aframe 5.0 0) 0.5)
                       :frame-num (ja-aframe 1.0 0)
                       )
@@ -442,7 +442,7 @@
         )
       (let ((s5-3 (new 'stack-no-clear 'vector)))
         (set! (-> s5-3 quad) (-> self root trans quad))
-        (ja-no-eval :group! (-> self draw art-group data 10)
+        (ja-no-eval :group! crocadog-escort-jump-in-vehicle-ja
                     :num! (seek! (ja-aframe 7.0 0) 0.5)
                     :frame-num (ja-aframe 5.0 0)
                     )
@@ -469,7 +469,7 @@
           )
         )
       (quaternion-copy! (new 'stack-no-clear 'quaternion) (-> self root quat))
-      (ja-no-eval :group! (-> self draw art-group data 10)
+      (ja-no-eval :group! crocadog-escort-jump-in-vehicle-ja
                   :num! (seek! (ja-aframe 12.0 0) 0.5)
                   :frame-num (ja-aframe 7.0 0)
                   )
@@ -566,7 +566,7 @@
     )
   :code (behavior ()
     (until #f
-      (ja-no-eval :group! (-> self draw art-group data 11) :num! (seek! max (-> self anim-speed)) :frame-num 0.0)
+      (ja-no-eval :group! crocadog-escort-idle-car0-ja :num! (seek! max (-> self anim-speed)) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! max (-> self anim-speed)))
@@ -632,7 +632,7 @@
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.1))
     (let ((gp-0 (new 'stack-no-clear 'inline-array 'matrix 2)))
-      (ja-no-eval :group! (-> self draw art-group data 10)
+      (ja-no-eval :group! crocadog-escort-jump-in-vehicle-ja
                   :num! (seek! (ja-aframe 7.0 0) 0.25)
                   :frame-num (ja-aframe 12.0 0)
                   )
@@ -660,7 +660,7 @@
         (ja :num! (seek! (ja-aframe 7.0 0) 0.25))
         )
       (set! (-> gp-0 0 vector 1 quad) (-> self root trans quad))
-      (ja-no-eval :group! (-> self draw art-group data 10)
+      (ja-no-eval :group! crocadog-escort-jump-in-vehicle-ja
                   :num! (seek! (ja-aframe 5.0 0) 0.5)
                   :frame-num (ja-aframe 7.0 0)
                   )
@@ -683,7 +683,7 @@
         )
       (logclear! (-> self focus-status) (focus-status pilot-riding))
       (set! (-> gp-0 0 quad 0) (-> self root trans quad))
-      (ja-no-eval :group! (-> self draw art-group data 10)
+      (ja-no-eval :group! crocadog-escort-jump-in-vehicle-ja
                   :num! (seek! (ja-aframe 0.0 0))
                   :frame-num (ja-aframe 5.0 0)
                   )
@@ -871,12 +871,12 @@
       (cond
         ((zero? (get-rand-int self 3))
          (ja-channel-push! 1 (seconds 0.1))
-         (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek! (ja-aframe 3.0 0) 0.5) :frame-num 0.0)
+         (ja-no-eval :group! crocadog-escort-idle-bark-ja :num! (seek! (ja-aframe 3.0 0) 0.5) :frame-num 0.0)
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek! (ja-aframe 3.0 0) 0.5))
            )
-         (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek! max 0.33) :frame-num (ja-aframe 3.0 0))
+         (ja-no-eval :group! crocadog-escort-idle-bark-ja :num! (seek! max 0.33) :frame-num (ja-aframe 3.0 0))
          (until (ja-done? 0)
            (suspend)
            (ja :num! (seek! max 0.33))
@@ -885,7 +885,7 @@
         (else
           (ja-channel-push! 1 (seconds 0.1))
           (let ((f30-0 (get-rand-float-range self 0.4 0.6)))
-            (ja-no-eval :group! (-> self draw art-group data 14) :num! (seek! max f30-0) :frame-num 0.0)
+            (ja-no-eval :group! crocadog-escort-angry-bark-ja :num! (seek! max f30-0) :frame-num 0.0)
             (until (ja-done? 0)
               (suspend)
               (ja :num! (seek! max f30-0))

test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc-states_REF.gc

@@ -53,7 +53,7 @@
   :code (behavior ()
     (let ((v1-2 (ja-group)))
       (cond
-        ((and v1-2 (= v1-2 (-> self draw art-group data 3)))
+        ((and v1-2 (= v1-2 kid-escort-idle0-ja))
          (ja-no-eval :num! (seek! max 0.1))
          (while (not (ja-done? 0))
            (suspend)
@@ -66,7 +66,7 @@
         )
       )
     (until #f
-      (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.1) :frame-num 0.0)
+      (ja-no-eval :group! kid-escort-idle0-ja :num! (seek! max 0.1) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! max 0.1))
@@ -115,7 +115,7 @@
     )
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! kid-escort-turn0-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -338,7 +338,7 @@
     (ja-channel-push! 1 (seconds 0.1))
     (let ((gp-0 (new 'stack-no-clear 'matrix)))
       (quaternion-copy! (the-as quaternion (-> gp-0 vector)) (-> self root quat))
-      (ja-no-eval :group! (-> self draw art-group data 10)
+      (ja-no-eval :group! kid-escort-jump-in-vehicle-ja
                   :num! (seek! (ja-aframe 1.0 0) 0.25)
                   :frame-num (ja-aframe 0.0 0)
                   )
@@ -362,7 +362,7 @@
       (let ((s5-3 (new 'stack-no-clear 'vector)))
         (set! (-> s5-3 quad) (-> self root trans quad))
         (quaternion-copy! (the-as quaternion (-> gp-0 vector)) (-> self root quat))
-        (ja-no-eval :group! (-> self draw art-group data 10)
+        (ja-no-eval :group! kid-escort-jump-in-vehicle-ja
                     :num! (seek! (ja-aframe 8.0 0))
                     :frame-num (ja-aframe 1.0 0)
                     )
@@ -408,7 +408,7 @@
         )
       0
       (quaternion-copy! (new 'stack-no-clear 'quaternion) (-> self root quat))
-      (ja-no-eval :group! (-> self draw art-group data 10)
+      (ja-no-eval :group! kid-escort-jump-in-vehicle-ja
                   :num! (seek! (ja-aframe 12.0 0) 0.25)
                   :frame-num (ja-aframe 8.0 0)
                   )
@@ -483,8 +483,8 @@
     )
   :code (behavior ()
     (ja-channel-push! 2 (seconds 0.2))
-    (ja :group! (-> self draw art-group data 11))
-    (ja :chan 1 :group! (-> self draw art-group data 12))
+    (ja :group! kid-escort-vehicle-lean-x-ja)
+    (ja :chan 1 :group! kid-escort-vehicle-lean-z-ja)
     (let ((f30-0 0.5)
           (f28-0 0.5)
           (f26-0 0.5)
@@ -572,7 +572,7 @@
   :code (behavior ()
     (local-vars (sv-80 float) (sv-96 float))
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 10)
+    (ja-no-eval :group! kid-escort-jump-in-vehicle-ja
                 :num! (seek! (ja-aframe 8.0 0) 0.25)
                 :frame-num (ja-aframe 12.0 0)
                 )
@@ -600,7 +600,7 @@
           (s5-1 (new 'stack-no-clear 'quaternion))
           )
       (set! (-> gp-4 quad) (-> self root trans quad))
-      (ja-no-eval :group! (-> self draw art-group data 10)
+      (ja-no-eval :group! kid-escort-jump-in-vehicle-ja
                   :num! (seek! (ja-aframe 0.0 0))
                   :frame-num (ja-aframe 8.0 0)
                   )
@@ -875,7 +875,7 @@
        )
       (else
         (ja-channel-push! 1 (seconds 0.1))
-        (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek! max 0.143) :frame-num 0.0)
+        (ja-no-eval :group! kid-escort-arrest-start-ja :num! (seek! max 0.143) :frame-num 0.0)
         (until (ja-done? 0)
           (suspend)
           (ja :num! (seek! max 0.143))
@@ -883,11 +883,11 @@
         )
       )
     (let ((v1-34 (ja-group)))
-      (if (not (and v1-34 (= v1-34 (-> self draw art-group data 8))))
+      (if (not (and v1-34 (= v1-34 kid-escort-arrest-start-ja)))
           (ja-channel-push! 1 (seconds 0.1))
           )
       )
-    (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0)
+    (ja-no-eval :group! kid-escort-arrest-idle0-ja :num! (seek! max 0.1) :frame-num 0.0)
     (when (not (logtest? (bot-flags bf19) (-> self bot-flags)))
       (until #f
         (until (ja-done? 0)
@@ -897,7 +897,7 @@
           (suspend)
           (ja :num! (seek! max 0.1))
           )
-        (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0)
+        (ja-no-eval :group! kid-escort-arrest-idle0-ja :num! (seek! max 0.1) :frame-num 0.0)
         )
       #f
       (label cfg-27)
@@ -925,7 +925,7 @@
         (suspend)
         (ja :num! (seek! max 0.1))
         )
-      (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0)
+      (ja-no-eval :group! kid-escort-arrest-idle0-ja :num! (seek! max 0.1) :frame-num 0.0)
       )
     #f
     )
@@ -947,12 +947,12 @@
     )
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek! max 0.143) :frame-num 0.0)
+    (ja-no-eval :group! kid-escort-arrest-start-ja :num! (seek! max 0.143) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek! max 0.143))
       )
-    (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0)
+    (ja-no-eval :group! kid-escort-arrest-idle0-ja :num! (seek! max 0.1) :frame-num 0.0)
     (until #f
       (until (ja-done? 0)
         (if (and (logtest? (-> self bot-flags) (bot-flags failed))
@@ -964,7 +964,7 @@
         (suspend)
         (ja :num! (seek! max 0.1))
         )
-      (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0)
+      (ja-no-eval :group! kid-escort-arrest-idle0-ja :num! (seek! max 0.1) :frame-num 0.0)
       )
     #f
     )
@@ -1019,20 +1019,20 @@
   :code (behavior ()
     (ja-channel-push! 1 (seconds 0.2))
     (dotimes (gp-0 3)
-      (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek! max 0.1) :frame-num 0.0)
+      (ja-no-eval :group! kid-escort-idle0-ja :num! (seek! max 0.1) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! max 0.1))
         )
       )
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek! max 0.143) :frame-num 0.0)
+    (ja-no-eval :group! kid-escort-arrest-start-ja :num! (seek! max 0.143) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek! max 0.143))
       )
     (until #f
-      (ja-no-eval :group! (-> self draw art-group data 9) :num! (seek! max 0.1) :frame-num 0.0)
+      (ja-no-eval :group! kid-escort-arrest-idle0-ja :num! (seek! max 0.1) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek! max 0.1))

test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc

@@ -1124,17 +1124,17 @@
     (ja-channel-push! 3 (seconds 0.2))
     (case (-> (the-as vehicle (handle->process (-> self vehicle))) info object-type)
       ((11 12 13)
-       (ja :group! (-> self draw art-group data 12))
-       (ja :chan 1 :group! (-> self draw art-group data 13))
-       (ja :chan 2 :group! (-> self draw art-group data 14))
+       (ja :group! babak-idle-bike-back-sides-ja)
+       (ja :chan 1 :group! babak-idle-bike-sides-ja)
+       (ja :chan 2 :group! babak-idle-bike-forward-sides-ja)
        )
       ((14 15 16)
-       (ja :group! (-> self draw art-group data 9))
-       (ja :chan 1 :group! (-> self draw art-group data 10))
-       (ja :chan 2 :group! (-> self draw art-group data 11))
+       (ja :group! babak-idle-car-back-sides-ja)
+       (ja :chan 1 :group! babak-idle-car-sides-ja)
+       (ja :chan 2 :group! babak-idle-car-forward-sides-ja)
        )
       )
-    (let ((v1-26 (ja-channel-float! (the-as art-joint-anim (-> self draw art-group data 15)) 0.0 0.0 0.0)))
+    (let ((v1-26 (ja-channel-float! (the-as art-joint-anim babak-idle-hair-ja) 0.0 0.0 0.0)))
       (when v1-26
         (set! (-> self skel interp-select 0) (the-as int (the-as uint #x8100002000)))
         (set! (-> self skel interp-select 1) 0)
@@ -1926,7 +1926,7 @@
     (ja-channel-push! 1 (seconds 0.2))
     (until #f
       (countdown (gp-0 (+ (rand-vu-int-count 4) 1))
-        (ja-no-eval :group! (-> self draw art-group data 18)
+        (ja-no-eval :group! babak-idle-patty-wagon-ja
                     :num! (seek! (ja-aframe 4.0 0) 0.25)
                     :frame-num (ja-aframe 0.0 0)
                     )
@@ -1935,7 +1935,7 @@
           (ja :num! (seek! (ja-aframe 4.0 0) 0.25))
           )
         )
-      (ja-no-eval :group! (-> self draw art-group data 18)
+      (ja-no-eval :group! babak-idle-patty-wagon-ja
                   :num! (seek! (ja-aframe 8.0 0) 0.5)
                   :frame-num (ja-aframe 4.0 0)
                   )
@@ -1946,7 +1946,7 @@
       (cond
         ((zero? (rand-vu-int-count 2))
          (countdown (gp-3 (+ (rand-vu-int-count 4) 1))
-           (ja-no-eval :group! (-> self draw art-group data 18)
+           (ja-no-eval :group! babak-idle-patty-wagon-ja
                        :num! (seek! (ja-aframe 12.0 0) 0.25)
                        :frame-num (ja-aframe 8.0 0)
                        )
@@ -1958,7 +1958,7 @@
          )
         (else
           (countdown (gp-4 (+ (rand-vu-int-count 4) 1))
-            (ja-no-eval :group! (-> self draw art-group data 18)
+            (ja-no-eval :group! babak-idle-patty-wagon-ja
                         :num! (seek! (ja-aframe 16.0 0) 0.4)
                         :frame-num (ja-aframe 12.0 0)
                         )
@@ -1969,7 +1969,7 @@
             )
           )
         )
-      (ja-no-eval :group! (-> self draw art-group data 18)
+      (ja-no-eval :group! babak-idle-patty-wagon-ja
                   :num! (seek! (ja-aframe 4.0 0) 0.5)
                   :frame-num (ja-aframe 8.0 0)
                   )

test/decompiler/reference/jak2/levels/city/port/ctyport-part_REF.gc

@@ -3779,7 +3779,7 @@ This commonly includes things such as:
   :post (behavior ()
     (ja-post)
     (if (nonzero? (-> self part))
-        (spawn-with-cspace (-> self part) (-> self node-list data 5))
+        (spawn-with-cspace (-> self part) (joint-node-index farthy-lod0-jg halo))
         )
     )
   )

test/decompiler/reference/jak2/levels/city/port/race/errol-chal_REF.gc

@@ -469,14 +469,14 @@
     (ja-channel-push! 1 (seconds 0.05))
     (cond
       ((zero? (rand-vu-int-count 2))
-       (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0)
+       (ja-no-eval :group! errol-racer-bike-taunt-left-ja :num! (seek!) :frame-num 0.0)
        (until (ja-done? 0)
          (suspend)
          (ja :num! (seek!))
          )
        )
       (else
-        (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0)
+        (ja-no-eval :group! errol-racer-bike-taunt-right-ja :num! (seek!) :frame-num 0.0)
         (until (ja-done? 0)
           (suspend)
           (ja :num! (seek!))

test/decompiler/reference/jak2/levels/city/shuttle/shuttle_REF.gc

@@ -605,8 +605,8 @@
             )
         (ja-channel-push! 1 (seconds 0.2))
         (if (zero? s5-0)
-            (ja-no-eval :group! (-> self draw art-group data 4) :num! min)
-            (ja-no-eval :group! (-> self draw art-group data 6) :num! min)
+            (ja-no-eval :group! citizen-rebel-idle-to-arms-hips-ja :num! min)
+            (ja-no-eval :group! citizen-rebel-idle-to-arms-crossed-ja :num! min)
             )
         (let ((f28-0 0.0))
           (while (< f28-0 1.0)
@@ -622,14 +622,14 @@
           (+! gp-0 -1)
           (cond
             ((zero? s5-0)
-             (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek! max f30-1) :frame-num 0.0)
+             (ja-no-eval :group! citizen-rebel-arms-hips-ja :num! (seek! max f30-1) :frame-num 0.0)
              (until (ja-done? 0)
                (suspend)
                (ja :num! (seek! max f30-1))
                )
              )
             (else
-              (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek! max f30-1) :frame-num 0.0)
+              (ja-no-eval :group! citizen-rebel-arms-crossed-ja :num! (seek! max f30-1) :frame-num 0.0)
               (until (ja-done? 0)
                 (suspend)
                 (ja :num! (seek! max f30-1))
@@ -757,8 +757,8 @@
             )
         (ja-channel-push! 1 (seconds 0.2))
         (if (zero? s5-0)
-            (ja-no-eval :group! (-> self draw art-group data 4) :num! min)
-            (ja-no-eval :group! (-> self draw art-group data 6) :num! min)
+            (ja-no-eval :group! citizen-rebel-idle-to-arms-hips-ja :num! min)
+            (ja-no-eval :group! citizen-rebel-idle-to-arms-crossed-ja :num! min)
             )
         (let ((f28-0 0.0))
           (while (< f28-0 1.0)
@@ -774,14 +774,14 @@
           (+! gp-0 -1)
           (cond
             ((zero? s5-0)
-             (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek! max f30-1) :frame-num 0.0)
+             (ja-no-eval :group! citizen-rebel-arms-hips-ja :num! (seek! max f30-1) :frame-num 0.0)
              (until (ja-done? 0)
                (suspend)
                (ja :num! (seek! max f30-1))
                )
              )
             (else
-              (ja-no-eval :group! (-> self draw art-group data 7) :num! (seek! max f30-1) :frame-num 0.0)
+              (ja-no-eval :group! citizen-rebel-arms-crossed-ja :num! (seek! max f30-1) :frame-num 0.0)
               (until (ja-done? 0)
                 (suspend)
                 (ja :num! (seek! max f30-1))

test/decompiler/reference/jak2/levels/city/slums/kor/kid-states_REF.gc

@@ -48,7 +48,7 @@
   :code (behavior ()
     (let ((v1-2 (ja-group)))
       (cond
-        ((and v1-2 (= v1-2 (-> self draw art-group data 3)))
+        ((and v1-2 (= v1-2 kid-idle0-ja))
          (ja-no-eval :num! (seek!))
          (while (not (ja-done? 0))
            (suspend)
@@ -61,7 +61,7 @@
         )
       )
     (until #f
-      (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! kid-idle0-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
@@ -148,16 +148,16 @@
               (cond
                 ((< f0-8 18204.445)
                  (set! f0-9 9102.223)
-                 (set! s4-1 (-> self draw art-group data 8))
+                 (set! s4-1 kid-turn-left50-end0-ja)
                  (set! f28-0 8.0)
                  )
                 ((< f0-8 27306.666)
                  (set! f0-9 18204.445)
-                 (set! s4-1 (-> self draw art-group data 9))
+                 (set! s4-1 kid-turn-left100-end0-ja)
                  )
                 (else
                   (set! f0-9 27306.666)
-                  (set! s4-1 (-> self draw art-group data 10))
+                  (set! s4-1 kid-turn-left150-end0-ja)
                   )
                 )
               )
@@ -168,16 +168,16 @@
               (cond
                 ((< -18204.445 f0-8)
                  (set! f0-9 -9102.223)
-                 (set! s4-1 (-> self draw art-group data 12))
+                 (set! s4-1 kid-turn-right50-end0-ja)
                  (set! f28-0 8.0)
                  )
                 ((< -27306.666 f0-8)
                  (set! f0-9 -18204.445)
-                 (set! s4-1 (-> self draw art-group data 13))
+                 (set! s4-1 kid-turn-right100-end0-ja)
                  )
                 (else
                   (set! f0-9 -27306.666)
-                  (set! s4-1 (-> self draw art-group data 14))
+                  (set! s4-1 kid-turn-right150-end0-ja)
                   )
                 )
               )
@@ -273,7 +273,7 @@
   :code (behavior ()
     (let ((v1-2 (ja-group)))
       (cond
-        ((and v1-2 (= v1-2 (-> self draw art-group data 4)))
+        ((and v1-2 (= v1-2 kid-scared0-ja))
          (ja-no-eval :num! (seek!))
          (while (not (ja-done? 0))
            (suspend)
@@ -286,7 +286,7 @@
         )
       )
     (until #f
-      (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! kid-scared0-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
@@ -447,7 +447,7 @@
   :code (behavior ()
     (local-vars (v1-31 enemy-flag) (v1-39 enemy-flag))
     (ja-channel-push! 1 (seconds 0.1))
-    (ja-no-eval :group! (-> self draw art-group data 3) :num! (seek!) :frame-num 0.0)
+    (ja-no-eval :group! kid-idle0-ja :num! (seek!) :frame-num 0.0)
     (until (ja-done? 0)
       (suspend)
       (ja :num! (seek!))
@@ -544,7 +544,7 @@
   :code (behavior ()
     (when (not (logtest? (bot-flags bf20) (-> self bot-flags)))
       (ja-channel-push! 1 (seconds 0.1))
-      (ja-no-eval :group! (-> self draw art-group data 15) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! kid-arrest-start-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (suspend)
         (ja :num! (seek!))
@@ -562,13 +562,13 @@
           )
       )
     (let ((v1-35 (ja-group)))
-      (if (not (and v1-35 (= v1-35 (-> self draw art-group data 15))))
+      (if (not (and v1-35 (= v1-35 kid-arrest-start-ja)))
           (ja-channel-push! 1 (seconds 0.1))
           )
       )
     (set-time! (-> self state-time))
     (until #f
-      (ja-no-eval :group! (-> self draw art-group data 16) :num! (seek!) :frame-num 0.0)
+      (ja-no-eval :group! kid-arrest-idle0-ja :num! (seek!) :frame-num 0.0)
       (until (ja-done? 0)
         (if (and (logtest? (-> self bot-flags) (bot-flags failed))
                  (time-elapsed? (-> self state-time) (seconds 4))