diff --git a/decompiler/config/jak3/all-types.gc b/decompiler/config/jak3/all-types.gc
index 9789786c27a..93c5ef579e8 100644
--- a/decompiler/config/jak3/all-types.gc
+++ b/decompiler/config/jak3/all-types.gc
@@ -10786,8 +10786,8 @@
   (darkjak-smack 41)
   (darkjak-bomb0 42)
   (darkjak-bomb1 43)
-  (feature44 44)
-  (feature45 45)
+  (darkjak-tracking 44)
+  (darkjak-invinc 45)
   (lightjak 46)
   (lightjak-regen 47)
   (lightjak-swoop 48)
@@ -16986,7 +16986,6 @@
   )
 
 ;; +++game-info-h:continue-flags
-;; TODO copied from jak 2
 (defenum continue-flags
   :type uint32
   :bitfield #t
@@ -16996,32 +16995,32 @@
   (no-auto 3)
   (no-blackout 4)
   (game-start 5)
-  (demo-end 6)
+  (grab)
   (warp-gate 7)
   (demo 8)
   (intro 9)
   (hero-mode 10)
-  (demo-movie 11)
+  (darkjak)
   (title 12)
   (title-movie 13)
   (continue-flag-14 14)
   (copy-entity-pos 15)
-  (continue-flag-16 16)
-  (test 17)
-  (record-path 18)
-  (pilot 19)
-  (pilot-dax 20)
-  (record-sig 21)
-  (indax 22)
-  (cf23 23)
-  (cf24 24)
-  (cf25 25)
-  (cf26 26)
-  (cf27 27)
-  (cf28 28)
-  (cf29 29)
-  (cf30 30)
-  (cf31 31)
+  (test)
+  (nothing-apparently 17)
+  (race 18)
+  (credits)
+  (indax)
+  (mech)
+  (continue-flag-22 22)
+  (flut 23)
+  (flut-racer 24)
+  (vehicle 25)
+  (vehicle-movie 26)
+  (indax-hang 27)
+  (flut-fight 28)
+  (htorpedo 29)
+  (vehicle-scorpion 30)
+  (lightjak 31)
   )
 ;; ---game-info-h:continue-flags
 
@@ -23226,15 +23225,15 @@
   :bitfield #t
   :type uint32
   (force-on)
+  (endless-dark)
   (active)
+  (smack)
   (bomb0)
   (bomb1)
+  (tracking)
   (invinc)
-  (giant)
+  (invis)
   (no-anim)
-  (disable-force-on)
-  (ds8 8)
-  (ds9 9)
   )
 ;; ---target-h:darkjak-stage
 
diff --git a/decompiler/config/jak3/ntsc_v1/stack_structures.jsonc b/decompiler/config/jak3/ntsc_v1/stack_structures.jsonc
index 6d37afdc17a..c16c66cebed 100644
--- a/decompiler/config/jak3/ntsc_v1/stack_structures.jsonc
+++ b/decompiler/config/jak3/ntsc_v1/stack_structures.jsonc
@@ -1113,11 +1113,11 @@
   "(method 199 wvehicle)": [[16, "wvehicle-stack-type3"]],
   "(method 169 wcar-snake-base)": [[16, "wcar-proj-init-by-other-params"]],
   "(method 79 wcar-snake-base)": [
-    [16, ["inline-array", "quaternion", 2]],
+    [16, ["inline-array", "quaternion", 3]],
     [64, "wcar-stack-type1"]
   ],
   "(method 79 v-turtle)": [
-    [16, ["inline-array", "quaternion", 2]],
+    [16, ["inline-array", "quaternion", 3]],
     [64, "wvehicle-physics-work"],
     [128, "wvehicle-jmod-work"]
   ],
@@ -1155,7 +1155,7 @@
   ],
   "(method 24 w-parking-spot)": [[16, "cquery-with-5vec"]],
   "(method 79 v-scorpion)": [
-    [32, ["inline-array", "quaternion", 2]],
+    [32, ["inline-array", "quaternion", 3]],
     [16, "vector"],
     [80, "wvehicle-physics-work"]
   ],
@@ -1170,9 +1170,8 @@
   "(method 169 v-rhino)": [[16, "wcar-rhino-proj-params"]],
   "(method 169 v-mirage)": [[16, "wcar-toad-stack-var0"]],
   "(method 79 v-rhino)": [
-    [16, ["inline-array", "quaternion", 2]],
-    [48, ["inline-array", "quaternion", 1]],
-    [64, ["inline-array", "quaternion", 2]]
+    [16, ["inline-array", "quaternion", 3]],
+    [64, ["inline-array", "quaternion", 3]]
   ],
   "(method 17 turret-control)": [[16, "turret-control-stack-var0"]],
   "(method 9 turret-control)": [
diff --git a/decompiler/level_extractor/extract_level.cpp b/decompiler/level_extractor/extract_level.cpp
index 0572f032209..8a3a5349ca7 100644
--- a/decompiler/level_extractor/extract_level.cpp
+++ b/decompiler/level_extractor/extract_level.cpp
@@ -180,6 +180,11 @@ level_tools::BspHeader extract_bsp_from_level(const ObjectFileDB& db,
   bsp_header.read_from_file(bsp_file.linked_data, db.dts, &draw_stats, db.version());
   ASSERT((int)bsp_header.drawable_tree_array.trees.size() == bsp_header.drawable_tree_array.length);
 
+  if (db.version() == GameVersion::Jak1 && dgo_name == "TIT.DGO" && bsp_header.name == "intro") {
+    // grrr.....
+    bsp_header.name = "title";
+  }
+
   /*
   level_tools::PrintSettings settings;
   settings.expand_collide = true;
diff --git a/game/overlord/jak2/srpc.cpp b/game/overlord/jak2/srpc.cpp
index 1dd4b180a5c..23ccec27391 100644
--- a/game/overlord/jak2/srpc.cpp
+++ b/game/overlord/jak2/srpc.cpp
@@ -365,6 +365,10 @@ void* RPC_Player(unsigned int /*fno*/, void* data, int size) {
       case Jak2SoundCommand::set_fps: {
         gFPS = cmd->fps.fps;
       } break;
+      case Jak2SoundCommand::cancel_dgo: {
+        // temporary. here just so we don't assert.
+        lg::error("RPC Player dgo cancel command received");
+      } break;
       default:
         ASSERT_MSG(false, fmt::format("Unhandled RPC Player command {}", int(cmd->j2command)));
     }
diff --git a/goal_src/jak1/engine/level/level.gc b/goal_src/jak1/engine/level/level.gc
index a255e234a2a..6c391347c19 100644
--- a/goal_src/jak1/engine/level/level.gc
+++ b/goal_src/jak1/engine/level/level.gc
@@ -141,6 +141,9 @@
              (else
               (load-dbg "bsp relocate: ~A~%" this)
               ;; everything is okay, link the bsp and level.
+              ;; og:preserve-this fix bad filename.
+              (when (= (-> s5-0 name) 'title)
+                  (set! (-> this name) 'title))
               (set! (-> s5-0 bsp) this)
               (set! (-> this level) s5-0)
               this
diff --git a/goal_src/jak3/engine/debug/bug-report.gc b/goal_src/jak3/engine/debug/bug-report.gc
index b56f7912e6f..9e34126deeb 100644
--- a/goal_src/jak3/engine/debug/bug-report.gc
+++ b/goal_src/jak3/engine/debug/bug-report.gc
@@ -18,7 +18,7 @@
       (new 'static 'continue-point
         :name "wasall-start"
         :level #f
-        :flags (continue-flags continue-flag-16)
+        :flags (continue-flags test)
         :trans (new 'static 'vector :x 9283373.0 :y 126422.22 :z 1057314.9 :w 1.0)
         :camera-trans (new 'static 'vector :x 9272728.0 :y 147014.05 :z 1009150.4 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -36 #x5dfc 22 #x56de))
diff --git a/goal_src/jak3/engine/debug/default-menu.gc b/goal_src/jak3/engine/debug/default-menu.gc
index 4633e0a486c..d06e68024a4 100644
--- a/goal_src/jak3/engine/debug/default-menu.gc
+++ b/goal_src/jak3/engine/debug/default-menu.gc
@@ -1214,25 +1214,13 @@
                  (let ((s3-0 (-> (the-as drawable-tree-instance-shrub v1-7) info prototype-inline-array-shrub)))
                    (dotimes (s2-0 (-> s3-0 length))
                      (let ((a1-4
-                             (new
-                               'global
-                               'debug-menu-item-flag
-                               (-> s3-0 data s2-0 name)
-                               (the-as int (-> s3-0 data s2-0 name))
-                               dm-instance-pick-func
-                               )
+                             (new 'global 'debug-menu-item-flag (-> s3-0 data s2-0 name) (-> s3-0 data s2-0 name) dm-instance-pick-func)
                              )
                            )
                        (debug-menu-append-item *instance-shrub-menu* a1-4)
                        )
                      (let ((a1-6
-                             (new
-                               'debug
-                               'debug-menu-item-flag
-                               (-> s3-0 data s2-0 name)
-                               (the-as int (-> s3-0 data s2-0 name))
-                               dm-enable-instance-func
-                               )
+                             (new 'debug 'debug-menu-item-flag (-> s3-0 data s2-0 name) (-> s3-0 data s2-0 name) dm-enable-instance-func)
                              )
                            )
                        (set! (-> a1-6 is-on) #t)
@@ -1249,7 +1237,7 @@
                                'debug
                                'debug-menu-item-flag
                                (-> s3-1 array-data s2-1 name)
-                               (the-as int (-> s3-1 array-data s2-1 name))
+                               (-> s3-1 array-data s2-1 name)
                                dm-instance-pick-func
                                )
                              )
@@ -1261,7 +1249,7 @@
                                'debug
                                'debug-menu-item-flag
                                (-> s3-1 array-data s2-1 name)
-                               (the-as int (-> s3-1 array-data s2-1 name))
+                               (-> s3-1 array-data s2-1 name)
                                dm-enable-instance-func
                                )
                              )
@@ -1415,61 +1403,61 @@
   (let ((a1-3 (new 'debug 'debug-menu-item-submenu "Mode" arg1)))
     (debug-menu-append-item arg0 a1-3)
     )
-  (let ((a1-5 (new 'debug 'debug-menu-item-flag "Default" (the-as int #f) dm-cam-mode-default)))
+  (let ((a1-5 (new 'debug 'debug-menu-item-flag "Default" #f dm-cam-mode-default)))
     (debug-menu-append-item arg1 a1-5)
     )
-  (let ((a1-7 (new 'debug 'debug-menu-item-flag "Free-floating" (the-as int cam-free-floating) dm-cam-mode-func)))
+  (let ((a1-7 (new 'debug 'debug-menu-item-flag "Free-floating" cam-free-floating dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-7)
     )
-  (let ((a1-9 (new 'debug 'debug-menu-item-flag "Fixed" (the-as int cam-fixed) dm-cam-mode-func)))
+  (let ((a1-9 (new 'debug 'debug-menu-item-flag "Fixed" cam-fixed dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-9)
     )
-  (let ((a1-11 (new 'debug 'debug-menu-item-flag "No Trans" (the-as int cam-no-trans) dm-cam-mode-func)))
+  (let ((a1-11 (new 'debug 'debug-menu-item-flag "No Trans" cam-no-trans dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-11)
     )
-  (let ((a1-13 (new 'debug 'debug-menu-item-flag "Pov" (the-as int cam-pov) dm-cam-mode-func)))
+  (let ((a1-13 (new 'debug 'debug-menu-item-flag "Pov" cam-pov dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-13)
     )
-  (let ((a1-15 (new 'debug 'debug-menu-item-flag "Pov180" (the-as int cam-pov180) dm-cam-mode-func)))
+  (let ((a1-15 (new 'debug 'debug-menu-item-flag "Pov180" cam-pov180 dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-15)
     )
-  (let ((a1-17 (new 'debug 'debug-menu-item-flag "Pov-track" (the-as int cam-pov-track) dm-cam-mode-func)))
+  (let ((a1-17 (new 'debug 'debug-menu-item-flag "Pov-track" cam-pov-track dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-17)
     )
-  (let ((a1-19 (new 'debug 'debug-menu-item-flag "Decel" (the-as int cam-decel) dm-cam-mode-func)))
+  (let ((a1-19 (new 'debug 'debug-menu-item-flag "Decel" cam-decel dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-19)
     )
-  (let ((a1-21 (new 'debug 'debug-menu-item-flag "Endless fall" (the-as int cam-endlessfall) dm-cam-mode-func)))
+  (let ((a1-21 (new 'debug 'debug-menu-item-flag "Endless fall" cam-endlessfall dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-21)
     )
-  (let ((a1-23 (new 'debug 'debug-menu-item-flag "Eye" (the-as int cam-eye) dm-cam-mode-func)))
+  (let ((a1-23 (new 'debug 'debug-menu-item-flag "Eye" cam-eye dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-23)
     )
-  (let ((a1-25 (new 'debug 'debug-menu-item-flag "Stick" (the-as int cam-stick) dm-cam-mode-func)))
+  (let ((a1-25 (new 'debug 'debug-menu-item-flag "Stick" cam-stick dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-25)
     )
-  (let ((a1-27 (new 'debug 'debug-menu-item-flag "String" (the-as int cam-string) dm-cam-mode-func)))
+  (let ((a1-27 (new 'debug 'debug-menu-item-flag "String" cam-string dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-27)
     )
-  (let ((a1-29 (new 'debug 'debug-menu-item-flag "Standoff" (the-as int cam-standoff) dm-cam-mode-func)))
+  (let ((a1-29 (new 'debug 'debug-menu-item-flag "Standoff" cam-standoff dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-29)
     )
-  (let ((a1-31 (new 'debug 'debug-menu-item-flag "Circular" (the-as int cam-circular) dm-cam-mode-func)))
+  (let ((a1-31 (new 'debug 'debug-menu-item-flag "Circular" cam-circular dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-31)
     )
-  (let ((a1-33 (new 'debug 'debug-menu-item-flag "Look At" (the-as int cam-lookat) dm-cam-mode-func)))
+  (let ((a1-33 (new 'debug 'debug-menu-item-flag "Look At" cam-lookat dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-33)
     )
-  (let ((a1-35 (new 'debug 'debug-menu-item-flag "Center of world" (the-as int cam-point-watch) dm-cam-mode-func)))
+  (let ((a1-35 (new 'debug 'debug-menu-item-flag "Center of world" cam-point-watch dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-35)
     )
-  (let ((a1-37 (new 'debug 'debug-menu-item-flag "Spline" (the-as int cam-spline) dm-cam-mode-func)))
+  (let ((a1-37 (new 'debug 'debug-menu-item-flag "Spline" cam-spline dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-37)
     )
-  (let ((a1-39 (new 'debug 'debug-menu-item-flag "Tube Sled" (the-as int cam-tube-sled) dm-cam-mode-func)))
+  (let ((a1-39 (new 'debug 'debug-menu-item-flag "Tube Sled" cam-tube-sled dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-39)
     )
-  (let ((a1-41 (new 'debug 'debug-menu-item-flag "Bike" (the-as int cam-bike) dm-cam-mode-func)))
+  (let ((a1-41 (new 'debug 'debug-menu-item-flag "Bike" cam-bike dm-cam-mode-func)))
     (debug-menu-append-item arg1 a1-41)
     )
   )
@@ -1485,29 +1473,26 @@
       (let ((a1-6 (new 'debug 'debug-menu-item-submenu "External" s3-0)))
         (debug-menu-append-item gp-0 a1-6)
         )
-      (let ((a1-8 (new 'debug 'debug-menu-item-flag "CPad 0" (the-as int 'pad-0) dm-cam-externalize)))
+      (let ((a1-8 (new 'debug 'debug-menu-item-flag "CPad 0" 'pad-0 dm-cam-externalize)))
         (debug-menu-append-item s3-0 a1-8)
         )
-      (let ((a1-10 (new 'debug 'debug-menu-item-flag "CPad 1" (the-as int 'pad-1) dm-cam-externalize)))
+      (let ((a1-10 (new 'debug 'debug-menu-item-flag "CPad 1" 'pad-1 dm-cam-externalize)))
         (debug-menu-append-item s3-0 a1-10)
         )
-      (let ((a1-12 (new 'debug 'debug-menu-item-flag "Lock" (the-as int 'locked) dm-cam-externalize)))
+      (let ((a1-12 (new 'debug 'debug-menu-item-flag "Lock" 'locked dm-cam-externalize)))
         (debug-menu-append-item s3-0 a1-12)
         )
-      (let ((a1-14 (new 'debug 'debug-menu-item-flag "Reset" (the-as int 'reset) dm-cam-externalize)))
+      (let ((a1-14 (new 'debug 'debug-menu-item-flag "Reset" 'reset dm-cam-externalize)))
         (debug-menu-append-item s3-0 a1-14)
         )
-      (let ((a1-16 (new 'debug 'debug-menu-item-flag "Allow z rot" (the-as int 'allow-z) dm-cam-externalize)))
+      (let ((a1-16 (new 'debug 'debug-menu-item-flag "Allow z rot" 'allow-z dm-cam-externalize)))
         (debug-menu-append-item s3-0 a1-16)
         )
       (let ((s2-0 (new 'debug 'debug-menu-item-var "Fov" 0 80)))
         (debug-menu-item-var-make-float s2-0 dm-cam-render-float 1.0 #t 15.0 180.0 1)
         (debug-menu-append-item s3-0 s2-0)
         )
-      (let ((a1-21
-              (new 'debug 'debug-menu-item-flag "turbo free" (the-as int '*camera-turbo-free*) dm-boolean-toggle-pick-func)
-              )
-            )
+      (let ((a1-21 (new 'debug 'debug-menu-item-flag "turbo free" '*camera-turbo-free* dm-boolean-toggle-pick-func)))
         (debug-menu-append-item s3-0 a1-21)
         )
       )
@@ -1515,25 +1500,13 @@
       (let ((a1-24 (new 'debug 'debug-menu-item-submenu "Collision" s3-1)))
         (debug-menu-append-item gp-0 a1-24)
         )
-      (let ((a1-26 (new
-                     'debug
-                     'debug-menu-item-flag
-                     "Record"
-                     (the-as int '*record-cam-collide-history*)
-                     dm-boolean-toggle-pick-func
-                     )
-                   )
+      (let ((a1-26 (new 'debug 'debug-menu-item-flag "Record" '*record-cam-collide-history* dm-boolean-toggle-pick-func))
             )
         (debug-menu-append-item s3-1 a1-26)
         )
-      (let ((a1-28 (new
-                     'debug
-                     'debug-menu-item-flag
-                     "Display"
-                     (the-as int '*display-cam-collide-history*)
-                     dm-boolean-toggle-pick-func
-                     )
-                   )
+      (let ((a1-28
+              (new 'debug 'debug-menu-item-flag "Display" '*display-cam-collide-history* dm-boolean-toggle-pick-func)
+              )
             )
         (debug-menu-append-item s3-1 a1-28)
         )
@@ -1542,13 +1515,10 @@
       (let ((a1-31 (new 'debug 'debug-menu-item-submenu "Settings" s4-1)))
         (debug-menu-append-item gp-0 a1-31)
         )
-      (let ((a1-33 (new 'debug 'debug-menu-item-flag "Default" (the-as int #f) dm-cam-settings-default)))
+      (let ((a1-33 (new 'debug 'debug-menu-item-flag "Default" #f dm-cam-settings-default)))
         (debug-menu-append-item s4-1 a1-33)
         )
-      (let ((a1-35
-              (new 'debug 'debug-menu-item-flag "turbo free" (the-as int '*camera-turbo-free*) dm-boolean-toggle-pick-func)
-              )
-            )
+      (let ((a1-35 (new 'debug 'debug-menu-item-flag "turbo free" '*camera-turbo-free* dm-boolean-toggle-pick-func)))
         (debug-menu-append-item s4-1 a1-35)
         )
       (let ((s3-2 (new 'debug 'debug-menu-item-var "Fov" (the-as int 'fov) 80)))
@@ -1604,127 +1574,66 @@
                      'debug
                      'debug-menu-item-flag
                      "no mip/lod correction"
-                     (the-as int '*camera-no-mip-correction*)
+                     '*camera-no-mip-correction*
                      dm-boolean-toggle-pick-func
                      )
                    )
             )
         (debug-menu-append-item s4-1 a1-65)
         )
-      (let ((a1-67 (new
-                     'debug
-                     'debug-menu-item-flag
-                     "last attacker"
-                     (the-as int '*display-camera-last-attacker*)
-                     dm-boolean-toggle-pick-func
-                     )
-                   )
+      (let ((a1-67
+              (new 'debug 'debug-menu-item-flag "last attacker" '*display-camera-last-attacker* dm-boolean-toggle-pick-func)
+              )
             )
         (debug-menu-append-item s4-1 a1-67)
         )
-      (let ((a1-69 (new
-                     'debug
-                     'debug-menu-item-flag
-                     "old stats"
-                     (the-as int '*display-camera-old-stats*)
-                     dm-boolean-toggle-pick-func
-                     )
-                   )
+      (let ((a1-69 (new 'debug 'debug-menu-item-flag "old stats" '*display-camera-old-stats* dm-boolean-toggle-pick-func))
             )
         (debug-menu-append-item s4-1 a1-69)
         )
-      (let ((a1-71 (new 'debug 'debug-menu-item-flag "Amy cam" (the-as int '*amy-cam*) dm-boolean-toggle-pick-func)))
+      (let ((a1-71 (new 'debug 'debug-menu-item-flag "Amy cam" '*amy-cam* dm-boolean-toggle-pick-func)))
         (debug-menu-append-item s4-1 a1-71)
         )
-      (let ((a1-73
-              (new 'debug 'debug-menu-item-flag "xyz axes" (the-as int '*display-xyz-axes*) dm-boolean-toggle-pick-func)
-              )
-            )
+      (let ((a1-73 (new 'debug 'debug-menu-item-flag "xyz axes" '*display-xyz-axes* dm-boolean-toggle-pick-func)))
         (debug-menu-append-item s4-1 a1-73)
         )
-      (let ((a1-75 (new
-                     'debug
-                     'debug-menu-item-flag
-                     "Master Marks"
-                     (the-as int '*display-cam-master-marks*)
-                     dm-boolean-toggle-pick-func
-                     )
-                   )
+      (let ((a1-75
+              (new 'debug 'debug-menu-item-flag "Master Marks" '*display-cam-master-marks* dm-boolean-toggle-pick-func)
+              )
             )
         (debug-menu-append-item s4-1 a1-75)
         )
-      (let ((a1-77
-              (new 'debug 'debug-menu-item-flag "Other Marks" (the-as int '*display-cam-other*) dm-boolean-toggle-pick-func)
-              )
-            )
+      (let ((a1-77 (new 'debug 'debug-menu-item-flag "Other Marks" '*display-cam-other* dm-boolean-toggle-pick-func)))
         (debug-menu-append-item s4-1 a1-77)
         )
-      (let ((a1-79 (new
-                     'debug
-                     'debug-menu-item-flag
-                     "los debug"
-                     (the-as int '*display-cam-los-debug*)
-                     dm-boolean-toggle-pick-func
-                     )
-                   )
-            )
+      (let ((a1-79 (new 'debug 'debug-menu-item-flag "los debug" '*display-cam-los-debug* dm-boolean-toggle-pick-func)))
         (debug-menu-append-item s4-1 a1-79)
         )
-      (let ((a1-81
-              (new 'debug 'debug-menu-item-flag "los info" (the-as int '*display-cam-los-info*) dm-boolean-toggle-pick-func)
-              )
-            )
+      (let ((a1-81 (new 'debug 'debug-menu-item-flag "los info" '*display-cam-los-info* dm-boolean-toggle-pick-func)))
         (debug-menu-append-item s4-1 a1-81)
         )
-      (let ((a1-83 (new
-                     'debug
-                     'debug-menu-item-flag
-                     "los Marks"
-                     (the-as int '*display-cam-los-marks*)
-                     dm-boolean-toggle-pick-func
-                     )
-                   )
-            )
+      (let ((a1-83 (new 'debug 'debug-menu-item-flag "los Marks" '*display-cam-los-marks* dm-boolean-toggle-pick-func)))
         (debug-menu-append-item s4-1 a1-83)
         )
-      (let ((a1-85 (new
-                     'debug
-                     'debug-menu-item-flag
-                     "coll Marks"
-                     (the-as int '*display-cam-coll-marks*)
-                     dm-boolean-toggle-pick-func
-                     )
-                   )
+      (let ((a1-85 (new 'debug 'debug-menu-item-flag "coll Marks" '*display-cam-coll-marks* dm-boolean-toggle-pick-func))
             )
         (debug-menu-append-item s4-1 a1-85)
         )
-      (let ((a1-87 (new
-                     'debug
-                     'debug-menu-item-flag
-                     "Camera Marks"
-                     (the-as int '*display-camera-marks*)
-                     dm-boolean-toggle-pick-func
-                     )
-                   )
+      (let ((a1-87 (new 'debug 'debug-menu-item-flag "Camera Marks" '*display-camera-marks* dm-boolean-toggle-pick-func))
             )
         (debug-menu-append-item s4-1 a1-87)
         )
       )
-    (let ((a1-89 (new
-                   'debug
-                   'debug-menu-item-flag
-                   "Edit"
-                   (the-as int '*cam-layout*)
-                   (lambda ((arg0 symbol) (arg1 debug-menu-msg))
-                     (when (= arg1 (debug-menu-msg press))
-                       (if (-> arg0 value)
-                           (cam-layout-stop)
-                           (cam-layout-start)
-                           )
-                       )
-                     (-> arg0 value)
-                     )
-                   )
+    (let ((a1-89 (new 'debug 'debug-menu-item-flag "Edit" '*cam-layout* (lambda ((arg0 symbol) (arg1 debug-menu-msg))
+                                                                          (when (= arg1 (debug-menu-msg press))
+                                                                            (if (-> arg0 value)
+                                                                                (cam-layout-stop)
+                                                                                (cam-layout-start)
+                                                                                )
+                                                                            )
+                                                                          (-> arg0 value)
+                                                                          )
+                      )
                  )
           )
       (debug-menu-append-item gp-0 a1-89)
@@ -1733,7 +1642,7 @@
                    'debug
                    'debug-menu-item-function
                    "Save Pos"
-                   (the-as int #f)
+                   #f
                    (the-as (function object object) debug-create-cam-restore)
                    )
                  )
@@ -1754,14 +1663,7 @@
         (debug-menu-append-item gp-0 a1-4)
         )
       )
-    (let ((a1-6 (new
-                  'debug
-                  'debug-menu-item-function
-                  "Refresh"
-                  (the-as int #f)
-                  (the-as (function object object) build-shader-list)
-                  )
-                )
+    (let ((a1-6 (new 'debug 'debug-menu-item-function "Refresh" #f (the-as (function object object) build-shader-list)))
           )
       (debug-menu-append-item gp-0 a1-6)
       )
@@ -1816,7 +1718,7 @@
                    'debug
                    'debug-menu-item-function
                    "all tweak+"
-                   (the-as int #f)
+                   #f
                    (the-as (function object object) (lambda () (all-texture-tweak-adjust *texture-page-dir* 0.1)))
                    )
                  )
@@ -1827,7 +1729,7 @@
                    'debug
                    'debug-menu-item-function
                    "all tweak-"
-                   (the-as int #f)
+                   #f
                    (the-as (function object object) (lambda () (all-texture-tweak-adjust *texture-page-dir* -0.1)))
                    )
                  )
@@ -2675,17 +2577,12 @@
         (debug-menu-append-item gp-0 a1-7)
         )
       )
-    (let ((a1-9 (new 'debug 'debug-menu-item-function "Refresh" (the-as int #f) build-instance-list)))
+    (let ((a1-9 (new 'debug 'debug-menu-item-function "Refresh" #f build-instance-list)))
       (debug-menu-append-item gp-0 a1-9)
       )
-    (let ((a1-11 (new
-                   'debug
-                   'debug-menu-item-function
-                   "Print Info"
-                   (the-as int #f)
-                   (the-as (function object object) print-prototype-list)
-                   )
-                 )
+    (let ((a1-11
+            (new 'debug 'debug-menu-item-function "Print Info" #f (the-as (function object object) print-prototype-list))
+            )
           )
       (debug-menu-append-item gp-0 a1-11)
       )
@@ -2796,14 +2693,9 @@
         (debug-menu-append-item gp-0 a1-31)
         )
       )
-    (let ((a1-33 (new
-                   'debug
-                   'debug-menu-item-flag
-                   "Instance Info"
-                   (the-as int '*display-instance-info*)
-                   dm-boolean-toggle-pick-func
-                   )
-                 )
+    (let ((a1-33
+            (new 'debug 'debug-menu-item-flag "Instance Info" '*display-instance-info* dm-boolean-toggle-pick-func)
+            )
           )
       (debug-menu-append-item gp-0 a1-33)
       )
@@ -2857,7 +2749,7 @@
                     (a0-5 arg1)
                     )
                 (when (if (= a0-5 'test)
-                          (logtest? (continue-flags continue-flag-16) (-> (the-as continue-point v1-2) flags))
+                          (logtest? (continue-flags test) (-> (the-as continue-point v1-2) flags))
                           #t
                           )
                   (let ((s2-0 (method-of-type pair new))
@@ -4413,7 +4305,7 @@
                   (set! (-> *game-info* debug-features)
                         (the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
                         )
-                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
                   )
                )
              (function
@@ -4504,7 +4396,7 @@
                   (set! (-> *game-info* features)
                         (the-as
                           game-feature
-                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
+                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
                                   (-> *game-info* features)
                                   )
                           )
@@ -4512,7 +4404,7 @@
                   (set! (-> *game-info* debug-features)
                         (the-as
                           game-feature
-                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
+                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
                                   (-> *game-info* debug-features)
                                   )
                           )
@@ -4527,7 +4419,7 @@
                   (set! (-> *game-info* features)
                         (the-as
                           game-feature
-                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
+                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
                                   (-> *game-info* features)
                                   )
                           )
@@ -4535,13 +4427,13 @@
                   (set! (-> *game-info* debug-features)
                         (the-as
                           game-feature
-                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
+                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
                                   (-> *game-info* debug-features)
                                   )
                           )
                         )
                   (send-event *target* 'get-pickup (pickup-type eco-pill-dark) 100.0)
-                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage active bomb0 no-anim disable-force-on))
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage endless-dark active tracking invinc))
                   )
                )
              (function
@@ -4557,7 +4449,7 @@
                   (set! (-> *game-info* debug-features)
                         (the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
                         )
-                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
                   )
                )
              (function
@@ -4573,14 +4465,14 @@
                   (set! (-> *game-info* debug-features)
                         (the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
                         )
-                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage bomb0))
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage active))
                   )
                )
              (function "smack" #f ,(lambda ((arg0 int) (arg1 debug-menu-msg) (arg2 float))
                                      (if (not *target*)
                                          (start 'debug (get-current-continue-forced *game-info*))
                                          )
-                                     (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1))
+                                     (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack))
                                      )
                        )
              (function
@@ -4590,7 +4482,7 @@
                   (if (not *target*)
                       (start 'debug (get-current-continue-forced *game-info*))
                       )
-                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1 invinc))
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack bomb0))
                   )
                )
              (function
@@ -4600,7 +4492,7 @@
                   (if (not *target*)
                       (start 'debug (get-current-continue-forced *game-info*))
                       )
-                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1 invinc giant))
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack bomb0 bomb1))
                   )
                )
              (function
@@ -4610,7 +4502,7 @@
                   (if (not *target*)
                       (start 'debug (get-current-continue-forced *game-info*))
                       )
-                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1 invinc giant no-anim))
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack bomb0 bomb1 tracking))
                   )
                )
              (function
@@ -4620,13 +4512,7 @@
                   (if (not *target*)
                       (start 'debug (get-current-continue-forced *game-info*))
                       )
-                  (send-event
-                    *target*
-                    'change-mode
-                    'darkjak
-                    #f
-                    (darkjak-stage force-on bomb0 invinc giant no-anim disable-force-on)
-                    )
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active bomb0 bomb1 tracking invinc))
                   )
                )
              )
@@ -7014,7 +6900,7 @@
               (set! (-> *game-info* debug-features)
                     (the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
                     )
-              (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
+              (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
               )
            )
          (function
diff --git a/goal_src/jak3/engine/game/game-info-h.gc b/goal_src/jak3/engine/game/game-info-h.gc
index a4dc47f0ca9..8614f663eda 100644
--- a/goal_src/jak3/engine/game/game-info-h.gc
+++ b/goal_src/jak3/engine/game/game-info-h.gc
@@ -121,7 +121,6 @@
 
 
 ;; +++continue-flags
-;; TODO copied from jak 2
 (defenum continue-flags
   :type uint32
   :bitfield #t
@@ -131,32 +130,32 @@
   (no-auto 3)
   (no-blackout 4)
   (game-start 5)
-  (demo-end 6)
+  (grab)
   (warp-gate 7)
   (demo 8)
   (intro 9)
   (hero-mode 10)
-  (demo-movie 11)
+  (darkjak)
   (title 12)
   (title-movie 13)
   (continue-flag-14 14)
   (copy-entity-pos 15)
-  (continue-flag-16 16)
-  (test 17)
-  (record-path 18)
-  (pilot 19)
-  (pilot-dax 20)
-  (record-sig 21)
-  (indax 22)
-  (cf23 23)
-  (cf24 24)
-  (cf25 25)
-  (cf26 26)
-  (cf27 27)
-  (cf28 28)
-  (cf29 29)
-  (cf30 30)
-  (cf31 31)
+  (test)
+  (nothing-apparently 17)
+  (race 18)
+  (credits)
+  (indax)
+  (mech)
+  (continue-flag-22 22)
+  (flut 23)
+  (flut-racer 24)
+  (vehicle 25)
+  (vehicle-movie 26)
+  (indax-hang 27)
+  (flut-fight 28)
+  (htorpedo 29)
+  (vehicle-scorpion 30)
+  (lightjak 31)
   )
 ;; ---continue-flags
 
diff --git a/goal_src/jak3/engine/game/game-info.gc b/goal_src/jak3/engine/game/game-info.gc
index b4ff04b720a..910e2c46806 100644
--- a/goal_src/jak3/engine/game/game-info.gc
+++ b/goal_src/jak3/engine/game/game-info.gc
@@ -2154,8 +2154,8 @@
                              darkjak-smack
                              darkjak-bomb0
                              darkjak-bomb1
-                             feature44
-                             feature45
+                             darkjak-tracking
+                             darkjak-invinc
                              lightjak
                              lightjak-regen
                              lightjak-swoop
diff --git a/goal_src/jak3/engine/game/main.gc b/goal_src/jak3/engine/game/main.gc
index da53ab2fce5..839d39bde7c 100644
--- a/goal_src/jak3/engine/game/main.gc
+++ b/goal_src/jak3/engine/game/main.gc
@@ -671,8 +671,8 @@
                  (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons r1))
                  (set! *cheat-mode* (not *cheat-mode*))
                  (if *cheat-mode*
-                     (sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
-                     (sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                     (sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                     (sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
                      )
                  (set! (-> *cheat-temp* 0) 0)
                  0
@@ -844,8 +844,8 @@
                                           )
                          )
                    (if (= *cheat-mode* 'debug)
-                       (sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
-                       (sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                       (sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                       (sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
                        )
                    (set! (-> *cheat-temp* 1) 0)
                    0
@@ -956,8 +956,8 @@
                                             )
                        )
                  (if *progress-cheat*
-                     (sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
-                     (sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                     (sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                     (sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
                      )
                  (set! (-> *cheat-temp* 2) 0)
                  0
@@ -1063,8 +1063,8 @@
                                               )
                          )
                    (if *progress-cheat*
-                       (sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
-                       (sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                       (sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                       (sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
                        )
                    (set! (-> *cheat-temp* 3) 0)
                    0
@@ -1174,11 +1174,11 @@
                            (external-cam-reset!)
                            )
                        (set! *external-cam-mode* 'pad-1)
-                       (sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                       (sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
                        )
                      (else
                        (set! *external-cam-mode* #f)
-                       (sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                       (sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
                        )
                      )
                    (set! (-> *cheat-temp* 5) 0)
@@ -1232,8 +1232,8 @@
                               darkjak-smack
                               darkjak-bomb0
                               darkjak-bomb1
-                              feature44
-                              feature45
+                              darkjak-tracking
+                              darkjak-invinc
                               lightjak
                               lightjak-regen
                               lightjak-swoop
@@ -1252,34 +1252,34 @@
                             )
                     )
                   )
-            (sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
+            (sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
             )
            ((and (cpad-pressed? 1 triangle) (!= *cheat-mode* 'debug))
             (send-event *target* 'get-pickup (pickup-type ammo-yellow) 1000.0)
             (send-event *target* 'get-pickup (pickup-type ammo-red) 1000.0)
             (send-event *target* 'get-pickup (pickup-type ammo-blue) 1000.0)
             (send-event *target* 'get-pickup (pickup-type ammo-dark) 1000.0)
-            (sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
+            (sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
             )
            ((cpad-pressed? 1 square)
             (set! (-> *level* disk-load-timing?) (not (-> *level* disk-load-timing?)))
             (if (-> *level* disk-load-timing?)
-                (sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
-                (sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                (sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                (sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
                 )
             )
            ((cpad-pressed? 1 r1)
             (set! *display-scene-control* (logxor *display-scene-control* (scene-controls bounds-spheres)))
             (if (logtest? *display-scene-control* (scene-controls bounds-spheres))
-                (sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
-                (sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                (sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                (sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
                 )
             )
            ((cpad-pressed? 1 circle)
             (set! *display-bug-report* (not *display-bug-report*))
             (if *display-bug-report*
-                (sound-play-by-spec (static-sound-spec "menu-pick" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
-                (sound-play-by-spec (static-sound-spec "menu-back" :group 1 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                (sound-play-by-spec (static-sound-spec "menu-pick" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
+                (sound-play-by-spec (static-sound-spec "menu-back" :group 0 :fo-curve 1) (new-sound-id) (the-as vector #t))
                 )
             )
            )
@@ -1657,7 +1657,7 @@
   (let ((gp-1 *display*))
     ;; initial setup
     (set! *teleport* #t)
-    (update *setting-control*) ;; dies on camera stuff, which looks for entities.
+    (update *setting-control*)
     (init-time-of-day-context *time-of-day-context*)
     (display-sync gp-1)
     (display-frame-finish gp-1)
diff --git a/goal_src/jak3/engine/game/settings-h.gc b/goal_src/jak3/engine/game/settings-h.gc
index 2ecd8eccd0e..912f5447337 100644
--- a/goal_src/jak3/engine/game/settings-h.gc
+++ b/goal_src/jak3/engine/game/settings-h.gc
@@ -108,8 +108,8 @@
   (darkjak-smack 41)
   (darkjak-bomb0 42)
   (darkjak-bomb1 43)
-  (feature44 44)
-  (feature45 45)
+  (darkjak-tracking 44)
+  (darkjak-invinc 45)
   (lightjak 46)
   (lightjak-regen 47)
   (lightjak-swoop 48)
diff --git a/goal_src/jak3/engine/game/task/task-control.gc b/goal_src/jak3/engine/game/task/task-control.gc
index 5b971fc741e..a38d466a7ee 100644
--- a/goal_src/jak3/engine/game/task/task-control.gc
+++ b/goal_src/jak3/engine/game/task/task-control.gc
@@ -320,7 +320,7 @@
       )
     (if (logtest? (game-secrets darkjak-tracking) (-> *game-info* secrets))
         (set! (-> *game-info* features)
-              (the-as game-feature (logior (game-feature feature44) (-> *game-info* features)))
+              (the-as game-feature (logior (game-feature darkjak-tracking) (-> *game-info* features)))
               )
         )
     (logior! (-> *game-info* features) (-> *game-info* debug-features))
@@ -784,7 +784,7 @@
             ((= (status-of-level-and-borrows *level* 'wasall #f) 'active)
              (set! gp-1 "wasdoors-desert")
              (if (and (-> *game-info* current-continue)
-                      (logtest? (continue-flags record-path) (-> *game-info* current-continue flags))
+                      (logtest? (continue-flags race) (-> *game-info* current-continue flags))
                       )
                  (set! gp-1 (-> *game-info* current-continue name))
                  )
@@ -1357,12 +1357,12 @@
        )
       (((game-task-node-command add-darkjak-tracking))
        (set! (-> *game-info* features)
-             (the-as game-feature (logior (game-feature feature44) (-> *game-info* features)))
+             (the-as game-feature (logior (game-feature darkjak-tracking) (-> *game-info* features)))
              )
        )
       (((game-task-node-command add-darkjak-invinc))
        (set! (-> *game-info* features)
-             (the-as game-feature (logior (game-feature feature45) (-> *game-info* features)))
+             (the-as game-feature (logior (game-feature darkjak-invinc) (-> *game-info* features)))
              )
        )
       (((game-task-node-command add-lighteco))
diff --git a/goal_src/jak3/engine/level/level-info.gc b/goal_src/jak3/engine/level/level-info.gc
index a68f209b8c7..3f57b547b03 100644
--- a/goal_src/jak3/engine/level/level-info.gc
+++ b/goal_src/jak3/engine/level/level-info.gc
@@ -150,7 +150,7 @@
                   (new 'static 'continue-point
                     :name "title-from-intro"
                     :level 'title
-                    :flags (continue-flags title cf26)
+                    :flags (continue-flags title vehicle-movie)
                     :trans (new 'static 'vector :x 4014080.0 :y 348160.0 :z 1417216.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x 76871.68 :y 55061.707 :z -938752.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 0 0 #x7fff))
@@ -194,7 +194,7 @@
                   (new 'static 'continue-point
                     :name "title-credits"
                     :level 'title
-                    :flags (continue-flags scene-wait pilot)
+                    :flags (continue-flags scene-wait credits)
                     :trans (new 'static 'vector :x 4014080.0 :y 348160.0 :z 1417216.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x 76871.68 :y 55061.707 :z -938752.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 0 0 #x7fff))
@@ -214,7 +214,7 @@
                   (new 'static 'continue-point
                     :name "title-museum1"
                     :level 'title
-                    :flags (continue-flags scene-wait pilot)
+                    :flags (continue-flags scene-wait credits)
                     :trans (new 'static 'vector :x 4014080.0 :y 348160.0 :z 1417216.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x 76871.68 :y 55061.707 :z -938752.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 0 0 #x7fff))
@@ -234,7 +234,7 @@
                   (new 'static 'continue-point
                     :name "title-museum2"
                     :level 'title
-                    :flags (continue-flags scene-wait pilot)
+                    :flags (continue-flags scene-wait credits)
                     :trans (new 'static 'vector :x 4014080.0 :y 348160.0 :z 1417216.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x 76871.68 :y 55061.707 :z -938752.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 0 0 #x7fff))
@@ -254,7 +254,7 @@
                   (new 'static 'continue-point
                     :name "title-museum3"
                     :level 'title
-                    :flags (continue-flags scene-wait pilot)
+                    :flags (continue-flags scene-wait credits)
                     :trans (new 'static 'vector :x 4014080.0 :y 348160.0 :z 1417216.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x 76871.68 :y 55061.707 :z -938752.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 0 0 #x7fff))
@@ -1283,7 +1283,7 @@
                   :continues '((new 'static 'continue-point
                       :name "ctygenb-start"
                       :level 'ctygenb
-                      :flags (continue-flags continue-flag-16)
+                      :flags (continue-flags test)
                       :trans (new 'static 'vector :x 686539.56 :y 40271.87 :z -1015174.75 :w 1.0)
                       :camera-trans (new 'static 'vector :x 647089.75 :y 59344.49 :z -1026199.94 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 29 #x53c6 22 -24771))
@@ -1437,7 +1437,7 @@
                     (new 'static 'continue-point
                       :name "ctygenb-mine"
                       :level 'ctygenb
-                      :flags (continue-flags continue-flag-16)
+                      :flags (continue-flags test)
                       :trans (new 'static 'vector :x 820940.8 :y 57328.844 :z -709940.8 :w 1.0)
                       :camera-trans (new 'static 'vector :x 776951.8 :y 77473.38 :z -728203.7 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -26 #x4d03 -36 -26171))
@@ -1543,7 +1543,7 @@
                      (new 'static 'continue-point
                        :name "ctysluma-alley"
                        :level 'ctysluma
-                       :flags (continue-flags scene-wait no-auto continue-flag-16)
+                       :flags (continue-flags scene-wait no-auto test)
                        :trans (new 'static 'vector :x 4721836.5 :y 32767.59 :z 730032.94 :w 1.0)
                        :camera-trans (new 'static 'vector :x 4756355.5 :y 53861.992 :z 692224.44 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -1690 0 #x7fd1))
@@ -1849,7 +1849,7 @@
                    :continues '((new 'static 'continue-point
                        :name "ctyslumc-start"
                        :level 'ctyslumc
-                       :flags (continue-flags continue-flag-16)
+                       :flags (continue-flags test)
                        :trans (new 'static 'vector :x 2453099.8 :y 7639.4497 :z -2268892.2 :w 1.0)
                        :camera-trans (new 'static 'vector :x 2476891.0 :y 28731.8 :z -2223565.2 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -22799 0 #x5bed))
@@ -1869,7 +1869,7 @@
                      (new 'static 'continue-point
                        :name "cty-blow-tower-mission"
                        :level 'ctyslumc
-                       :flags (continue-flags no-auto cf25)
+                       :flags (continue-flags no-auto vehicle)
                        :trans (new 'static 'vector :x 2453099.8 :y 32505.855 :z -2268892.8 :w 1.0)
                        :camera-trans (new 'static 'vector :x 2468703.8 :y 53571.586 :z -2220125.5 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -22799 0 #x5bed))
@@ -2055,7 +2055,7 @@
                     (new 'static 'continue-point
                       :name "ctyport-attack-start"
                       :level 'ctyport
-                      :flags (continue-flags no-auto cf29)
+                      :flags (continue-flags no-auto htorpedo)
                       :trans (new 'static 'vector :x -15787.622 :y 31600.64 :z 5435375.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x -65070.695 :y 52750.336 :z 5449853.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -15249 -42 -28998))
@@ -2114,7 +2114,7 @@
                     (new 'static 'continue-point
                       :name "ctyport-hijack-decoy"
                       :level 'ctyport
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 3025313.5 :y 59706.98 :z 5450023.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 3059521.2 :y 79520.56 :z 5402437.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -190 #x27db -3 -31135))
@@ -2134,7 +2134,7 @@
                     (new 'static 'continue-point
                       :name "ctyport-blow-tower"
                       :level 'ctyport
-                      :flags (continue-flags no-auto cf25)
+                      :flags (continue-flags no-auto vehicle)
                       :trans (new 'static 'vector :x 2356080.8 :y 36182.836 :z 6030970.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x 2356080.8 :y 48470.836 :z 6030970.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -12847 0 #x75bb))
@@ -2154,7 +2154,7 @@
                     (new 'static 'continue-point
                       :name "ctyport-hiphog"
                       :level 'ctyport
-                      :flags (continue-flags continue-flag-16)
+                      :flags (continue-flags test)
                       :trans (new 'static 'vector :x -237165.36 :y 31635.455 :z 5517031.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x -213388.9 :y 52731.086 :z 5552992.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -31813 0 #x1e97))
@@ -2350,7 +2350,7 @@
                     (new 'static 'continue-point
                       :name "ctyport-assault"
                       :level 'ctyport
-                      :flags (continue-flags continue-flag-16)
+                      :flags (continue-flags test)
                       :trans (new 'static 'vector :x -237165.36 :y 31635.455 :z 5517031.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x -213388.9 :y 52731.086 :z 5552992.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -31813 0 #x1e97))
@@ -2426,7 +2426,7 @@
                     (new 'static 'continue-point
                       :name "ctyport-bbush-port-4-missile"
                       :level 'ctyport
-                      :flags (continue-flags no-auto cf29)
+                      :flags (continue-flags no-auto htorpedo)
                       :trans (new 'static 'vector :x 2492384.8 :y 34605.055 :z 6578958.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x 2541912.0 :y 55486.875 :z 6565986.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 6 #x50b3 36 -25430))
@@ -2609,7 +2609,7 @@
                   :continues '((new 'static 'continue-point
                       :name "ctyinda-start"
                       :level 'ctyinda
-                      :flags (continue-flags continue-flag-16)
+                      :flags (continue-flags test)
                       :trans (new 'static 'vector :x 3945097.8 :y 110584.625 :z 3721824.8 :w 1.0)
                       :camera-trans (new 'static 'vector :x 3971861.0 :y 129763.734 :z 3686880.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x6d2 0 #x7fcd))
@@ -3243,7 +3243,7 @@
                    :continues '((new 'static 'continue-point
                        :name "stadiumb-start"
                        :level 'stadiumb
-                       :flags (continue-flags no-auto continue-flag-16)
+                       :flags (continue-flags no-auto test)
                        :trans (new 'static 'vector :x -71093.86 :y -46009.957 :z -2018556.4 :w 1.0)
                        :camera-trans (new 'static 'vector :x -122139.85 :y -24800.871 :z -2014586.0 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x4f86 0 #x6448))
@@ -3670,7 +3670,7 @@
                     (new 'static 'continue-point
                       :name "rubblea-rhino"
                       :level 'rubblea
-                      :flags (continue-flags scene-wait no-auto record-path)
+                      :flags (continue-flags scene-wait no-auto race)
                       :trans (new 'static 'vector :x -585186.94 :y 89194.086 :z -1169881.1 :w 1.0)
                       :camera-trans (new 'static 'vector :x -585855.4 :y 116445.59 :z -1221524.2 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x27e -219 #x223 -32753))
@@ -4192,7 +4192,7 @@
                    :continues '((new 'static 'continue-point
                        :name "onintent-start"
                        :level 'onintent
-                       :flags (continue-flags scene-wait continue-flag-16)
+                       :flags (continue-flags scene-wait test)
                        :trans (new 'static 'vector :x 3206013.0 :y 32764.314 :z 787585.44 :w 1.0)
                        :camera-trans (new 'static 'vector :x 3238502.5 :y 53785.805 :z 827149.1 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 72 #x75ad #x79 -12883))
@@ -4212,7 +4212,7 @@
                      (new 'static 'continue-point
                        :name "onintent-end"
                        :level 'onintent
-                       :flags (continue-flags scene-wait continue-flag-16)
+                       :flags (continue-flags scene-wait test)
                        :trans (new 'static 'vector :x 3185899.0 :y 33336.934 :z 742425.0 :w 1.0)
                        :camera-trans (new 'static 'vector :x 3181206.8 :y 47166.258 :z 765917.2 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 16 -7444 -42 #x7ca4))
@@ -4415,7 +4415,7 @@
                   :continues '((new 'static 'continue-point
                       :name "gungame-start"
                       :level 'gungame
-                      :flags (continue-flags continue-flag-16)
+                      :flags (continue-flags test)
                       :trans (new 'static 'vector :x 1506927.9 :y 34744.73 :z 5140666.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 1544226.4 :y 55298.867 :z 5109040.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x37be 0 -29493))
@@ -4435,7 +4435,7 @@
                     (new 'static 'continue-point
                       :name "gungame-movie"
                       :level 'gungame
-                      :flags (continue-flags continue-flag-16)
+                      :flags (continue-flags test)
                       :trans (new 'static 'vector :x 1506927.9 :y 34744.73 :z 5140666.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 1544226.4 :y 55298.867 :z 5109040.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x37be 0 -29493))
@@ -5428,7 +5428,7 @@
                   (new 'static 'continue-point
                     :name "comba-sled"
                     :level 'comba
-                    :flags (continue-flags no-auto record-path)
+                    :flags (continue-flags no-auto race)
                     :trans (new 'static 'vector :x 820601.6 :y -57798.246 :z 47158.887 :w 1.0)
                     :camera-trans (new 'static 'vector :x 777019.0 :y -32215.45 :z 44085.246 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x3f1 #x5a67 -1546 #x5a50))
@@ -5724,7 +5724,7 @@
                   (new 'static 'continue-point
                     :name "combn-lightjak"
                     :level 'combn
-                    :flags (continue-flags no-auto cf31)
+                    :flags (continue-flags no-auto lightjak)
                     :trans (new 'static 'vector :x 14608403.0 :y -164009.58 :z 608924.9 :w 1.0)
                     :camera-trans (new 'static 'vector :x 14557696.0 :y -142914.77 :z 616067.5 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x5a71 0 #x5a8e))
@@ -5831,7 +5831,7 @@
                 :continues '((new 'static 'continue-point
                     :name "railb-start"
                     :level 'railb
-                    :flags (continue-flags no-auto record-path)
+                    :flags (continue-flags no-auto race)
                     :trans (new 'static 'vector :x -694290.44 :y -128170.39 :z 4016339.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x -713932.8 :y 5734.4 :z 4112384.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x9ad -31423 #x22e1 #x1d1))
@@ -6027,7 +6027,7 @@
                 :continues '((new 'static 'continue-point
                     :name "raile-start"
                     :level 'raile
-                    :flags (continue-flags no-auto record-path)
+                    :flags (continue-flags no-auto race)
                     :trans (new 'static 'vector :x -196025.14 :y -9100242.0 :z 1043255.3 :w 1.0)
                     :camera-trans (new 'static 'vector :x -223124.69 :y -9055834.0 :z 1031985.1 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x8a7 -20852 #x2e10 -22242))
@@ -8473,7 +8473,7 @@
                  :continues '((new 'static 'continue-point
                      :name "wasall-start"
                      :level 'wasall
-                     :flags (continue-flags no-auto continue-flag-16)
+                     :flags (continue-flags no-auto test)
                      :trans (new 'static 'vector :x 9283373.0 :y 126422.22 :z 1057314.9 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9272728.0 :y 147014.05 :z 1009150.4 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -36 #x5dfc 22 #x56de))
@@ -8677,7 +8677,7 @@
                      (new 'static 'continue-point
                        :name "wascitya-start-flut"
                        :level 'wascitya
-                       :flags (continue-flags no-auto cf23)
+                       :flags (continue-flags no-auto flut)
                        :trans (new 'static 'vector :x 9234353.0 :y 27028.275 :z -281878.94 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9183710.0 :y 48123.496 :z -274296.84 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x62af 0 #x5182))
@@ -8697,7 +8697,7 @@
                      (new 'static 'continue-point
                        :name "wascitya-flut-racer"
                        :level 'wascitya
-                       :flags (continue-flags no-auto cf24)
+                       :flags (continue-flags no-auto flut-racer)
                        :trans (new 'static 'vector :x 9174756.0 :y 28741.633 :z -249075.72 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9152103.0 :y 49813.094 :z -203148.08 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -31633 0 -8532))
@@ -8959,7 +8959,7 @@
                      (new 'static 'continue-point
                        :name "wascityb-gungame-reset"
                        :level 'wascityb
-                       :flags (continue-flags no-auto cf25)
+                       :flags (continue-flags no-auto vehicle)
                        :trans (new 'static 'vector :x 6582161.0 :y 262058.8 :z -1938423.0 :w 1.0)
                        :camera-trans (new 'static 'vector :x 6580554.0 :y 282054.66 :z -1891336.6 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7ff8 0 -537))
@@ -8999,7 +8999,7 @@
                      (new 'static 'continue-point
                        :name "wascityb-defend-reset"
                        :level 'wascityb
-                       :flags (continue-flags no-auto cf25)
+                       :flags (continue-flags no-auto vehicle)
                        :trans (new 'static 'vector :x 6582161.0 :y 262058.8 :z -1938423.0 :w 1.0)
                        :camera-trans (new 'static 'vector :x 6580554.0 :y 282054.66 :z -1891336.6 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7ff8 0 -537))
@@ -9039,7 +9039,7 @@
                      (new 'static 'continue-point
                        :name "wascityb-flut"
                        :level 'wascityb
-                       :flags (continue-flags no-auto cf23)
+                       :flags (continue-flags no-auto flut)
                        :trans (new 'static 'vector :x 7209513.5 :y 128413.695 :z -1274676.0 :w 1.0)
                        :camera-trans (new 'static 'vector :x 7174367.5 :y 149534.72 :z -1237440.1 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 16 -29644 45 -13955))
@@ -9059,7 +9059,7 @@
                      (new 'static 'continue-point
                        :name "wascityb-flut-res"
                        :level 'wascityb
-                       :flags (continue-flags no-auto cf23)
+                       :flags (continue-flags no-auto flut)
                        :trans (new 'static 'vector :x 7209513.5 :y 128413.695 :z -1274676.0 :w 1.0)
                        :camera-trans (new 'static 'vector :x 7174367.5 :y 149534.72 :z -1237440.1 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 16 -29644 45 -13955))
@@ -9512,7 +9512,7 @@
                      (new 'static 'continue-point
                        :name "wasdoors-desert-any"
                        :level 'wasdoors
-                       :flags (continue-flags no-auto record-path)
+                       :flags (continue-flags no-auto race)
                        :trans (new 'static 'vector :x 9284744.0 :y 128190.875 :z 684149.56 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9281600.0 :y 149347.94 :z 632856.2 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #xc46 0 #x7f64))
@@ -9532,7 +9532,7 @@
                      (new 'static 'continue-point
                        :name "wasdoors-desert-turtle"
                        :level 'wasdoors
-                       :flags (continue-flags no-auto record-path)
+                       :flags (continue-flags no-auto race)
                        :trans (new 'static 'vector :x 9273955.0 :y 127025.97 :z 866910.6 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9274301.0 :y 148119.97 :z 815712.25 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 88 -6 #x7ffb))
@@ -9552,7 +9552,7 @@
                      (new 'static 'continue-point
                        :name "wasdoors-desert-snake"
                        :level 'wasdoors
-                       :flags (continue-flags no-auto record-path)
+                       :flags (continue-flags no-auto race)
                        :trans (new 'static 'vector :x 9273955.0 :y 127025.97 :z 866910.6 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9274301.0 :y 148119.97 :z 815712.25 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 88 -6 #x7ffb))
@@ -9572,7 +9572,7 @@
                      (new 'static 'continue-point
                        :name "wasdoors-desert-scorpion"
                        :level 'wasdoors
-                       :flags (continue-flags no-auto record-path)
+                       :flags (continue-flags no-auto race)
                        :trans (new 'static 'vector :x 9273955.0 :y 127025.97 :z 866910.6 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9274301.0 :y 148119.97 :z 815712.25 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 88 -6 #x7ffb))
@@ -9592,7 +9592,7 @@
                      (new 'static 'continue-point
                        :name "wasdoors-desert-toad"
                        :level 'wasdoors
-                       :flags (continue-flags no-auto record-path)
+                       :flags (continue-flags no-auto race)
                        :trans (new 'static 'vector :x 9273955.0 :y 127025.97 :z 866910.6 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9274301.0 :y 148119.97 :z 815712.25 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 88 -6 #x7ffb))
@@ -9612,7 +9612,7 @@
                      (new 'static 'continue-point
                        :name "wasdoors-artifact-race-1-intro-end"
                        :level 'wasdoors
-                       :flags (continue-flags no-auto record-path)
+                       :flags (continue-flags no-auto race)
                        :trans (new 'static 'vector :x 9360624.0 :y 126734.336 :z 718312.25 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9408733.0 :y 147828.33 :z 735797.7 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 6 -23749 -9 -22569))
@@ -9632,7 +9632,7 @@
                      (new 'static 'continue-point
                        :name "wasdoors-artifact-pre"
                        :level 'wasdoors
-                       :flags (continue-flags no-auto record-path)
+                       :flags (continue-flags no-auto race)
                        :trans (new 'static 'vector :x 9249314.0 :y 132965.17 :z 876837.7 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9250625.0 :y 152384.31 :z 925827.9 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -19 #x7fa3 #xf2 #x972))
@@ -11790,7 +11790,7 @@
                  :continues '((new 'static 'continue-point
                      :name "desert-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9283373.0 :y 126422.22 :z 1057314.9 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9272728.0 :y 147014.05 :z 1009150.4 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -36 #x5dfc 22 #x56de))
@@ -11810,7 +11810,7 @@
                    (new 'static 'continue-point
                      :name "desert-facing-wasdoors"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9279752.0 :y 133643.47 :z 1020903.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9277506.0 :y 152359.33 :z 1061803.6 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x236 #x7fd7 -1238 #x329))
@@ -11830,7 +11830,7 @@
                    (new 'static 'continue-point
                      :name "desert-scorpion-gun"
                      :level 'desert
-                     :flags (continue-flags no-auto cf25)
+                     :flags (continue-flags no-auto vehicle)
                      :trans (new 'static 'vector :x 9340766.0 :y 124521.266 :z 1113647.1 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9339435.0 :y 150994.12 :z 1077943.1 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1782 #x6dc 72 #x7f9c))
@@ -11850,7 +11850,7 @@
                    (new 'static 'continue-point
                      :name "desert-scorpion-gun-1"
                      :level 'desert
-                     :flags (continue-flags no-auto cf25)
+                     :flags (continue-flags no-auto vehicle)
                      :trans (new 'static 'vector :x 14767914.0 :y 135374.84 :z 10136262.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 14798791.0 :y 157549.77 :z 10124173.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1068 #x309c #xb2f -30155))
@@ -11870,7 +11870,7 @@
                    (new 'static 'continue-point
                      :name "desert-scorpion-gun-2"
                      :level 'desert
-                     :flags (continue-flags no-auto cf25)
+                     :flags (continue-flags no-auto vehicle)
                      :trans (new 'static 'vector :x 6763618.0 :y 85138.64 :z 7983003.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 6794250.0 :y 116340.33 :z 7986813.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #xa7 #x6222 #xd1 -21033))
@@ -11890,7 +11890,7 @@
                    (new 'static 'continue-point
                      :name "desert-scorpion-gun-3"
                      :level 'desert
-                     :flags (continue-flags no-auto cf25)
+                     :flags (continue-flags no-auto vehicle)
                      :trans (new 'static 'vector :x 6181083.0 :y 176762.88 :z 2517364.8 :w 1.0)
                      :camera-trans (new 'static 'vector :x 6149136.5 :y 206138.16 :z 2514886.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x4d0 -20675 -2467 -25266))
@@ -11910,7 +11910,7 @@
                    (new 'static 'continue-point
                      :name "desert-start-any"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9266747.0 :y 123430.09 :z 1080473.6 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9254848.0 :y 142267.19 :z 1121516.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x989 -45 #x7fa3))
@@ -11930,7 +11930,7 @@
                    (new 'static 'continue-point
                      :name "desert-start-turtle"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9266747.0 :y 123430.09 :z 1080473.6 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9254848.0 :y 142267.19 :z 1121516.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x989 -45 #x7fa3))
@@ -11950,7 +11950,7 @@
                    (new 'static 'continue-point
                      :name "desert-start-snake"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9266747.0 :y 123430.09 :z 1080473.6 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9254848.0 :y 142267.19 :z 1121516.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x989 -45 #x7fa3))
@@ -11970,7 +11970,7 @@
                    (new 'static 'continue-point
                      :name "desert-start-scorpion"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9266747.0 :y 123430.09 :z 1080473.6 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9254848.0 :y 142267.19 :z 1121516.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x989 -45 #x7fa3))
@@ -11990,7 +11990,7 @@
                    (new 'static 'continue-point
                      :name "desert-start-toad"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9266747.0 :y 123430.09 :z 1080473.6 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9254848.0 :y 142267.19 :z 1121516.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x989 -45 #x7fa3))
@@ -12010,7 +12010,7 @@
                    (new 'static 'continue-point
                      :name "desert-lizard-corral"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12394307.0 :y 88917.61 :z 11457055.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12441473.0 :y 111239.17 :z 11463575.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1569 #x605e -383 -21498))
@@ -12030,7 +12030,7 @@
                    (new 'static 'continue-point
                      :name "desert-lizard-corral-snake-1"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12380978.0 :y 87472.945 :z 11469247.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12369225.0 :y 108464.54 :z 11428414.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1907 -5508 -186 -32242))
@@ -12050,7 +12050,7 @@
                    (new 'static 'continue-point
                      :name "desert-lizard-corral-snake-2"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12341135.0 :y 87567.98 :z 11455479.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12299867.0 :y 108794.266 :z 11481984.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x2e7 #x7051 -209 #x3d4c))
@@ -12090,7 +12090,7 @@
                    (new 'static 'continue-point
                      :name "desert-nest-exit"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9052358.0 :y 83284.375 :z 9085710.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 8994050.0 :y 108485.016 :z 9055392.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x648 -16583 -373 -28209))
@@ -12110,7 +12110,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desd"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 15651864.0 :y 142954.5 :z 2969713.8 :w 1.0)
                      :camera-trans (new 'static 'vector :x 15653079.0 :y 164021.45 :z 3020865.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 26 #x7ff1 42 #x31f))
@@ -12130,7 +12130,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desc"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 3534418.0 :y 324452.75 :z 5562998.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 3519780.8 :y 344942.2 :z 5609219.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -22 -7329 -45 #x7cbe))
@@ -12150,7 +12150,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desa"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 5621998.0 :y 387778.97 :z 3335355.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 5610284.0 :y 408866.4 :z 3385172.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -3 #x7fde -3 -1438))
@@ -12170,7 +12170,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desg"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12909726.0 :y 165722.52 :z 10295038.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12947606.0 :y 186825.94 :z 10260609.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x10a6 0 #x7ee5))
@@ -12190,7 +12190,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desh"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12774632.0 :y 82657.69 :z 14474145.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12733889.0 :y 102872.266 :z 14499264.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 39 #x722c 16 #x39da))
@@ -12210,7 +12210,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desc-2"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 6303633.5 :y 313270.7 :z 7291769.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 6265247.5 :y 334363.84 :z 7257888.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -32449 0 -4548))
@@ -12230,7 +12230,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-dese"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 2655081.8 :y 72562.69 :z 10620010.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 2629825.8 :y 93656.266 :z 10664537.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -19 -25125 39 -21029))
@@ -12250,7 +12250,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desb"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 11717245.0 :y 121844.94 :z 658854.7 :w 1.0)
                      :camera-trans (new 'static 'vector :x 11751063.0 :y 142225.0 :z 624211.94 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x546d 0 -24624))
@@ -12270,7 +12270,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desa-2"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 6977682.0 :y 59582.055 :z 419910.44 :w 1.0)
                      :camera-trans (new 'static 'vector :x 6965355.5 :y 80625.664 :z 469413.88 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -32747 0 #x41f))
@@ -12290,7 +12290,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desc-3"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 806166.94 :y 182831.11 :z 6544611.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 777256.1 :y 203924.69 :z 6586858.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -27956 0 -17087))
@@ -12310,7 +12310,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desg-2"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12397906.0 :y 211421.6 :z 12644173.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12430085.0 :y 232395.98 :z 12683393.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 26 -32747 36 #x446))
@@ -12330,7 +12330,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desd-2"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 8716551.0 :y 143261.7 :z 5828874.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 8747487.0 :y 163276.8 :z 5793088.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -11006 0 #x788b))
@@ -12350,7 +12350,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desg-3"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 11045927.0 :y 109553.664 :z 11712216.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 11031834.0 :y 130646.836 :z 11662982.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -3 #xf21 42 #x7f16))
@@ -12370,7 +12370,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-dese-2"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 895466.3 :y 246845.44 :z 12161362.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 909384.06 :y 267799.75 :z 12210177.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -6 -31908 -42 #x1d14))
@@ -12390,7 +12390,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-dese-3"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 521345.84 :y 184066.05 :z 15728497.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 470152.4 :y 205157.98 :z 15728644.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -49 #x61bc 13 #x52a2))
@@ -12410,7 +12410,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desd-3"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 16138061.0 :y 54162.227 :z 5788602.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 16187264.0 :y 75255.4 :z 5774467.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -32511 0 #xfe2))
@@ -12430,7 +12430,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desb-2"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 15965142.0 :y 136031.44 :z 1682779.8 :w 1.0)
                      :camera-trans (new 'static 'vector :x 16012997.0 :y 156281.66 :z 1687586.4 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x4350 0 -27868))
@@ -12490,7 +12490,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desg-4"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12706330.0 :y 108822.12 :z 10588652.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12738304.0 :y 129281.64 :z 10625536.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -16 #x680f -39 -19076))
@@ -12510,7 +12510,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desa-3"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 2468171.0 :y 379272.4 :z 2138876.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 2435880.5 :y 400365.97 :z 2099137.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -42 -16334 -9 -28402))
@@ -12548,7 +12548,7 @@
                    (new 'static 'continue-point
                      :name "desert-boss-res-b"
                      :level 'desert
-                     :flags (continue-flags scene-wait no-auto record-path)
+                     :flags (continue-flags scene-wait no-auto race)
                      :trans (new 'static 'vector :x 9283373.0 :y 126422.22 :z 1057314.9 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9272728.0 :y 147014.05 :z 1009150.4 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -36 #x5dfc 22 #x56de))
@@ -12568,7 +12568,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desd-4"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 11725399.0 :y 232726.94 :z 4029474.8 :w 1.0)
                      :camera-trans (new 'static 'vector :x 11763166.0 :y 252992.31 :z 4058293.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x3971 0 -29280))
@@ -12588,7 +12588,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desc-4"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 4222015.5 :y 415771.03 :z 7156819.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 4181632.5 :y 435030.03 :z 7138538.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 36 #x7a0e -26 -9856))
@@ -12608,7 +12608,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desc-5"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 6357256.0 :y 102379.93 :z 7768775.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 6314594.5 :y 122449.92 :z 7748192.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7816 0 -11330))
@@ -12628,7 +12628,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desb-3"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 11126602.0 :y 106112.2 :z 1197135.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 11075782.0 :y 127205.375 :z 1203468.2 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -28900 0 -15436))
@@ -12648,7 +12648,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-dese-1"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 2386897.2 :y 398680.06 :z 9587007.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 2384640.5 :y 418615.72 :z 9540191.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -39 #x2add 19 -30873))
@@ -12668,7 +12668,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desf"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 5015841.0 :y 98922.086 :z 13601529.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 4986208.0 :y 118892.95 :z 13565056.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -19 -15020 39 -29120))
@@ -12708,7 +12708,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desd-5"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10125926.0 :y 259614.72 :z 3781514.8 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10141447.0 :y 280705.84 :z 3732736.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -39 #x170d 3 #x7de5))
@@ -12728,7 +12728,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desb-4"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9106742.0 :y 100738.25 :z 3052560.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9059008.0 :y 121065.88 :z 3044976.2 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -3 #x6f96 6 #x3eae))
@@ -12748,7 +12748,7 @@
                    (new 'static 'continue-point
                      :name "desert-ba-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9174216.0 :y 123262.16 :z 2099533.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9208165.0 :y 144207.05 :z 2069216.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -616 #x32dd -724 -30050))
@@ -12768,7 +12768,7 @@
                    (new 'static 'continue-point
                      :name "desert-bd-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10815025.0 :y 102545.41 :z 2497923.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10818434.0 :y 121769.58 :z 2453239.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x4d9 -1218 -1536 #x7fa9))
@@ -12788,7 +12788,7 @@
                    (new 'static 'continue-point
                      :name "desert-ab-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 7087109.5 :y 88144.69 :z 2644712.8 :w 1.0)
                      :camera-trans (new 'static 'vector :x 7038387.0 :y 109325.11 :z 2643588.2 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x3ac #x5964 -969 #x5b74))
@@ -12808,7 +12808,7 @@
                    (new 'static 'continue-point
                      :name "desert-ac-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 5267694.0 :y 210627.78 :z 2727774.2 :w 1.0)
                      :camera-trans (new 'static 'vector :x 5280323.0 :y 233042.33 :z 2688289.2 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1808 #x13b2 -455 -32321))
@@ -12828,7 +12828,7 @@
                    (new 'static 'continue-point
                      :name "desert-ca-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 4264788.0 :y 114527.84 :z 5167032.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 4238144.5 :y 132585.88 :z 5203264.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x1ee #x797b -1320 #x27e8))
@@ -12848,7 +12848,7 @@
                    (new 'static 'continue-point
                      :name "desert-ce-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 1920403.5 :y 89246.92 :z 7647962.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 1943748.6 :y 111184.28 :z 7604075.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x820 -7939 #x425 #x7bd6))
@@ -12868,7 +12868,7 @@
                    (new 'static 'continue-point
                      :name "desert-cf-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 5517754.0 :y 81149.95 :z 7359357.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 5491709.0 :y 103704.984 :z 7316846.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -2650 -8706 -1612 -31433))
@@ -12888,7 +12888,7 @@
                    (new 'static 'continue-point
                      :name "desert-fc-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 5731188.5 :y 101824.516 :z 10538363.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 5730499.5 :y 122402.0 :z 10589314.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -593 -32757 -314 -196))
@@ -12908,7 +12908,7 @@
                    (new 'static 'continue-point
                      :name "desert-fe-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 5369364.5 :y 67309.98 :z 13836079.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 5406458.5 :y 89869.11 :z 13866195.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -822 #x7366 -1467 -14066))
@@ -12928,7 +12928,7 @@
                    (new 'static 'continue-point
                      :name "desert-ef-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 3065982.2 :y 107245.57 :z 11426490.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 3053326.0 :y 128890.88 :z 11377862.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1068 -5776 -1179 -32213))
@@ -12948,7 +12948,7 @@
                    (new 'static 'continue-point
                      :name "desert-ec-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 1982650.8 :y 104885.86 :z 10504566.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 2007108.0 :y 126636.85 :z 10547168.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x312 #x7ba4 -704 -8394))
@@ -12968,7 +12968,7 @@
                    (new 'static 'continue-point
                      :name "desert-fh-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 6646727.5 :y 105947.55 :z 14136369.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 6598880.5 :y 124606.875 :z 14129300.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1071 #x5a2f #x68 #x5ab5))
@@ -12988,7 +12988,7 @@
                    (new 'static 'continue-point
                      :name "desert-fg-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 7501026.0 :y 129638.81 :z 10855417.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 7452133.0 :y 148057.7 :z 10847204.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -520 -21141 #x2dd -25014))
@@ -13008,7 +13008,7 @@
                    (new 'static 'continue-point
                      :name "desert-gf-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10470927.0 :y 100597.35 :z 10559268.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10515771.0 :y 118994.125 :z 10536350.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x264 -17232 -242 #x6cd2))
@@ -13028,7 +13028,7 @@
                    (new 'static 'continue-point
                      :name "desert-gh-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12397437.0 :y 88344.164 :z 11898591.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12422467.0 :y 106747.086 :z 11855134.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #xef -8742 #x59b #x7b38))
@@ -13048,7 +13048,7 @@
                    (new 'static 'continue-point
                      :name "desert-hg-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10930610.0 :y 96485.375 :z 13800077.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10903110.0 :y 118353.51 :z 13832512.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x175 #x783d -196 #x2bd3))
@@ -13068,7 +13068,7 @@
                    (new 'static 'continue-point
                      :name "desert-hf-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9955962.0 :y 89947.34 :z 14870607.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9993292.0 :y 112116.94 :z 14840056.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x621 -13998 -599 #x7387))
@@ -13088,7 +13088,7 @@
                    (new 'static 'continue-point
                      :name "desert-htemple-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10506505.0 :y 97552.8 :z 13772963.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10492059.0 :y 120096.36 :z 13728261.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x7ce #x13c9 0 #x7e34))
@@ -13108,7 +13108,7 @@
                    (new 'static 'continue-point
                      :name "desert-gd-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10063119.0 :y 88970.445 :z 9741795.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10018427.0 :y 107390.98 :z 9765995.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -766 #x6b01 -969 #x460d))
@@ -13128,7 +13128,7 @@
                    (new 'static 'continue-point
                      :name "desert-dg-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10774611.0 :y 154565.84 :z 7546899.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10763449.0 :y 175882.66 :z 7507808.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x6f #x118c -832 #x7ebd))
@@ -13148,7 +13148,7 @@
                    (new 'static 'continue-point
                      :name "desert-db-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10381380.0 :y 46965.555 :z 6078700.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10389444.0 :y 69219.53 :z 6128357.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -75 -32678 6 #x937))
@@ -13168,7 +13168,7 @@
                    (new 'static 'continue-point
                      :name "desert-tunnelc-exit"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 6866113.0 :y 91338.75 :z 8000343.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 6914560.0 :y 112599.86 :z 8000513.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1127 #x5a8e -1268 -23090))
@@ -13188,7 +13188,7 @@
                    (new 'static 'continue-point
                      :name "desert-tunnelf-exit"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 7974519.0 :y 91203.586 :z 9258848.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 7975734.5 :y 113736.086 :z 9210673.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x54c #xfc #xe5 #x7fde))
@@ -13208,7 +13208,7 @@
                    (new 'static 'continue-point
                      :name "desert-tunneld-exit"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 8464295.0 :y 94717.54 :z 7299125.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 8425602.0 :y 117229.57 :z 7291359.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1779 -20715 #x4e0 -25292))
@@ -13396,7 +13396,7 @@
                   :continues '((new 'static 'continue-point
                       :name "desertb-start"
                       :level 'desertb
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 11644513.0 :y 120889.34 :z 2970391.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 11695685.0 :y 142048.05 :z 2971192.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -28445 49 #x3f82))
@@ -13416,7 +13416,7 @@
                     (new 'static 'continue-point
                       :name "desertb-race-start"
                       :level 'desertb
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 11483517.0 :y 92969.78 :z 999301.1 :w 1.0)
                       :camera-trans (new 'static 'vector :x 11442637.0 :y 118434.2 :z 996084.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -271 #x5709 #x130 #x5dd2))
@@ -13436,7 +13436,7 @@
                     (new 'static 'continue-point
                       :name "desertb-race-pre-start"
                       :level 'desertb
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 11371971.0 :y 94167.04 :z 962314.25 :w 1.0)
                       :camera-trans (new 'static 'vector :x 11116160.0 :y 122627.69 :z 970056.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x1b7 #x5bee -377 #x5907))
@@ -13456,7 +13456,7 @@
                     (new 'static 'continue-point
                       :name "desertb-race-test-start"
                       :level 'desertb
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 10895748.0 :y 115178.29 :z 1023596.94 :w 1.0)
                       :camera-trans (new 'static 'vector :x 10853512.0 :y 132208.23 :z 1027103.94 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -317 #x5e31 #x1d7 #x56a0))
@@ -13476,7 +13476,7 @@
                     (new 'static 'continue-point
                       :name "desertb-race-record"
                       :level 'desertb
-                      :flags (continue-flags change-continue no-auto test)
+                      :flags (continue-flags change-continue no-auto nothing-apparently)
                       :trans (new 'static 'vector :x 11494007.0 :y 108865.945 :z 2089361.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 11492998.0 :y 129969.766 :z 2140546.2 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -3 #x7ffb -3 -452))
@@ -13496,7 +13496,7 @@
                     (new 'static 'continue-point
                       :name "desertb-time-trial-start"
                       :level 'desertb
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 11625416.0 :y 90477.77 :z 988189.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x 11575767.0 :y 111571.766 :z 975643.9 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x5029 0 #x63c5))
@@ -13516,7 +13516,7 @@
                     (new 'static 'continue-point
                       :name "desertb-final-boss-start"
                       :level 'desertb
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 9266747.0 :y 123430.09 :z 1080473.6 :w 1.0)
                       :camera-trans (new 'static 'vector :x 9254848.0 :y 142267.19 :z 1121516.8 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x989 -45 #x7fa3))
@@ -13556,7 +13556,7 @@
                     (new 'static 'continue-point
                       :name "desert-final-boss-res-movie"
                       :level 'desertb
-                      :flags (continue-flags scene-wait no-auto cf26)
+                      :flags (continue-flags scene-wait no-auto vehicle-movie)
                       :trans (new 'static 'vector :x 10677958.0 :y 114784.664 :z 523338.12 :w 1.0)
                       :camera-trans (new 'static 'vector :x 10711110.0 :y 135851.22 :z 484332.34 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -9718 -3 #x7a39))
@@ -13796,7 +13796,7 @@
                   :continues '((new 'static 'continue-point
                       :name "desertf-start"
                       :level 'desertf
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 7601819.5 :y 365067.47 :z 14977268.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 7623822.0 :y 386166.38 :z 15023483.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x737a 0 -14132))
@@ -13816,7 +13816,7 @@
                     (new 'static 'continue-point
                       :name "desertf-toad"
                       :level 'desertf
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 5863030.5 :y 109921.08 :z 12575995.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 5834114.5 :y 140238.03 :z 12607111.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x1e1 -30499 #x401 -11920))
@@ -13856,7 +13856,7 @@
                     (new 'static 'continue-point
                       :name "desertf-toad-chase"
                       :level 'desertf
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 6245907.5 :y 99122.79 :z 12166345.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 6284458.5 :y 120240.54 :z 12132636.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 9 #x372d 6 -29562))
@@ -13945,7 +13945,7 @@
                     (new 'static 'continue-point
                       :name "desert-hunt-intro"
                       :level 'desertg
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 9336744.0 :y 71967.945 :z 9525611.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 9363271.0 :y 93074.23 :z 9569379.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -30502 0 #x2eb7))
@@ -13965,7 +13965,7 @@
                     (new 'static 'continue-point
                       :name "desertg-hunt-res-start"
                       :level 'desertg
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 8495919.0 :y -92073.58 :z 8076573.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x 8482173.0 :y -63350.785 :z 8013929.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x418 -8165 #x2a6 -31705))
@@ -13985,7 +13985,7 @@
                     (new 'static 'continue-point
                       :name "desertg-hunt-res-end"
                       :level 'desertg
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 13162254.0 :y 145119.64 :z 7645461.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x 13176389.0 :y 171981.2 :z 7700640.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x53f -32468 -95 #x1065))
@@ -14005,7 +14005,7 @@
                     (new 'static 'continue-point
                       :name "desert-nest-entrance"
                       :level 'desertg
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 9223748.0 :y 72089.6 :z 9187663.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 9282260.0 :y 112844.39 :z 9228508.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x7c #x70ee #xeb -15413))
@@ -14025,7 +14025,7 @@
                     (new 'static 'continue-point
                       :name "desert-nest-exit"
                       :level 'desertg
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 8965557.0 :y 71516.16 :z 9015010.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 8919879.0 :y 96012.695 :z 8969672.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #xa99 -16498 -979 -28159))
@@ -14104,7 +14104,7 @@
                   :continues '((new 'static 'continue-point
                       :name "deserth-start"
                       :level 'deserth
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 11399696.0 :y 172503.45 :z 13225533.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 11424688.0 :y 194233.55 :z 13180632.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -9836 0 #x7a15))
@@ -14382,7 +14382,7 @@
                    :continues '((new 'static 'continue-point
                        :name "desrally-race-start"
                        :level 'desrally
-                       :flags (continue-flags change-continue no-auto record-path)
+                       :flags (continue-flags change-continue no-auto race)
                        :trans (new 'static 'vector :x 6289535.0 :y 92411.49 :z 8031117.5 :w 1.0)
                        :camera-trans (new 'static 'vector :x 6245386.0 :y 113111.45 :z 8030402.0 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x20c #x59c6 -606 #x5b28))
@@ -14402,7 +14402,7 @@
                      (new 'static 'continue-point
                        :name "desrally-record"
                        :level 'desrally
-                       :flags (continue-flags change-continue no-auto record-path)
+                       :flags (continue-flags change-continue no-auto race)
                        :trans (new 'static 'vector :x 5866029.5 :y 208657.2 :z 6777238.0 :w 1.0)
                        :camera-trans (new 'static 'vector :x 5871616.0 :y 229362.89 :z 6740352.0 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #xb60 -2480 #x3b6 #x7f0f))
@@ -14452,7 +14452,7 @@
                    :continues '((new 'static 'continue-point
                        :name "desert-hover-movie"
                        :level 'deshover
-                       :flags (continue-flags change-continue no-auto record-path)
+                       :flags (continue-flags change-continue no-auto race)
                        :trans (new 'static 'vector :x 5522368.0 :y 171279.56 :z 2212401.2 :w 1.0)
                        :camera-trans (new 'static 'vector :x 5572332.0 :y 192369.05 :z 2223532.8 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x6d6f 0 -16986))
@@ -15545,7 +15545,7 @@
                :continues '((new 'static 'continue-point
                    :name "nsta-start"
                    :level 'nsta
-                   :flags (continue-flags record-path)
+                   :flags (continue-flags race)
                    :trans (new 'static 'vector :x 7843291.0 :y -134689.17 :z 7799232.0 :w 1.0)
                    :camera-trans (new 'static 'vector :x 7886400.0 :y -115394.15 :z 7810056.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -26288 0 #x4c63))
@@ -15565,7 +15565,7 @@
                  (new 'static 'continue-point
                    :name "nsta-eggs"
                    :level 'nsta
-                   :flags (continue-flags no-auto record-path)
+                   :flags (continue-flags no-auto race)
                    :trans (new 'static 'vector :x 7843291.0 :y -134689.17 :z 7799232.0 :w 1.0)
                    :camera-trans (new 'static 'vector :x 7886400.0 :y -115394.15 :z 7810056.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -26288 0 #x4c63))
@@ -15585,7 +15585,7 @@
                  (new 'static 'continue-point
                    :name "nsta-cave"
                    :level 'nsta
-                   :flags (continue-flags no-auto record-path)
+                   :flags (continue-flags no-auto race)
                    :trans (new 'static 'vector :x 6744972.5 :y -392779.78 :z 2620850.2 :w 1.0)
                    :camera-trans (new 'static 'vector :x 6772533.0 :y -371657.94 :z 2664031.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7a77 0 -9518))
@@ -15605,7 +15605,7 @@
                  (new 'static 'continue-point
                    :name "nsta-fma"
                    :level 'nsta
-                   :flags (continue-flags no-auto record-path)
+                   :flags (continue-flags no-auto race)
                    :trans (new 'static 'vector :x 6782070.0 :y -341917.7 :z 3113670.2 :w 1.0)
                    :camera-trans (new 'static 'vector :x 6832845.5 :y -313126.1 :z 3071681.2 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x2c7 -13562 #xe8 #x7476))
@@ -15654,7 +15654,7 @@
                :continues '((new 'static 'continue-point
                    :name "nstb-start"
                    :level 'nstb
-                   :flags (continue-flags no-auto record-path)
+                   :flags (continue-flags no-auto race)
                    :trans (new 'static 'vector :x 6744972.5 :y -392779.78 :z 2620850.2 :w 1.0)
                    :camera-trans (new 'static 'vector :x 6772533.0 :y -371657.94 :z 2664031.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7a77 0 -9518))
@@ -15674,7 +15674,7 @@
                  (new 'static 'continue-point
                    :name "nstb-hunt"
                    :level 'nstb
-                   :flags (continue-flags no-auto record-path)
+                   :flags (continue-flags no-auto race)
                    :trans (new 'static 'vector :x 6744972.5 :y -392779.78 :z 2620850.2 :w 1.0)
                    :camera-trans (new 'static 'vector :x 6772533.0 :y -371657.94 :z 2664031.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7a77 0 -9518))
@@ -15694,7 +15694,7 @@
                  (new 'static 'continue-point
                    :name "nstb-crystal"
                    :level 'nstb
-                   :flags (continue-flags no-auto copy-entity-pos record-path)
+                   :flags (continue-flags no-auto copy-entity-pos race)
                    :trans (new 'static 'vector :x 6744972.5 :y -392779.78 :z 2620850.2 :w 1.0)
                    :camera-trans (new 'static 'vector :x 6772533.0 :y -371657.94 :z 2664031.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7a77 0 -9518))
@@ -15714,7 +15714,7 @@
                  (new 'static 'continue-point
                    :name "nstb-race"
                    :level 'nstb
-                   :flags (continue-flags no-auto record-path)
+                   :flags (continue-flags no-auto race)
                    :trans (new 'static 'vector :x 6744972.5 :y -392779.78 :z 2620850.2 :w 1.0)
                    :camera-trans (new 'static 'vector :x 6772533.0 :y -371657.94 :z 2664031.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7a77 0 -9518))
@@ -15734,7 +15734,7 @@
                  (new 'static 'continue-point
                    :name "nstb-escape"
                    :level 'nstb
-                   :flags (continue-flags no-auto record-path)
+                   :flags (continue-flags no-auto race)
                    :trans (new 'static 'vector :x 6617243.5 :y -371388.0 :z 2441774.0 :w 1.0)
                    :camera-trans (new 'static 'vector :x 6577418.0 :y -343491.78 :z 2384969.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -176 -9148 #x137 -31459))
@@ -15919,7 +15919,7 @@
                     (new 'static 'continue-point
                       :name "templex-ravine"
                       :level 'templex
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 17738900.0 :y 217505.8 :z 16952992.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 17753552.0 :y 238593.23 :z 16903936.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x810 -1104 #xd5c -32501))
@@ -15959,7 +15959,7 @@
                     (new 'static 'continue-point
                       :name "templex-top"
                       :level 'templex
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 17308740.0 :y 1084131.8 :z 16235471.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 17349566.0 :y 1105249.1 :z 16266326.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7421 0 -13775))
@@ -16360,7 +16360,7 @@
                     (new 'static 'continue-point
                       :name "templeb-glide"
                       :level 'templeb
-                      :flags (continue-flags no-auto cf31)
+                      :flags (continue-flags no-auto lightjak)
                       :trans (new 'static 'vector :x 17238664.0 :y 189938.89 :z 19509640.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 17262852.0 :y 210861.27 :z 19553988.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -28612 0 #x3e58))
@@ -16960,7 +16960,7 @@
                 :continues '((new 'static 'continue-point
                     :name "hanga-start"
                     :level 'hanga
-                    :flags (continue-flags no-auto record-path)
+                    :flags (continue-flags no-auto race)
                     :trans (new 'static 'vector :x 16819094.0 :y 1174688.1 :z 16639186.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x 16867160.0 :y 1199323.1 :z 16688642.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -445 #x7682 -1137 -12313))
@@ -16980,7 +16980,7 @@
                   (new 'static 'continue-point
                     :name "hanga-halfway"
                     :level 'hanga
-                    :flags (continue-flags no-auto record-path)
+                    :flags (continue-flags no-auto race)
                     :trans (new 'static 'vector :x 5954590.5 :y 1131934.9 :z 9072372.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x 5977600.0 :y 1156697.2 :z 9117896.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1058 #x7bb8 -2962 -7778))
@@ -17186,7 +17186,7 @@
       (new 'static 'continue-point
         :name "volcano-flut-1"
         :level 'volcanoa
-        :flags (continue-flags no-auto cf28)
+        :flags (continue-flags no-auto flut-fight)
         :trans (new 'static 'vector :x -8789.606 :y 81750.42 :z -1259742.9 :w 1.0)
         :camera-trans (new 'static 'vector :x -59694.695 :y 102857.12 :z -1265227.4 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x56db 0 #x5e00))
@@ -17204,7 +17204,7 @@
       (new 'static 'continue-point
         :name "volcano-flut-2"
         :level 'volcanoa
-        :flags (continue-flags no-auto cf28)
+        :flags (continue-flags no-auto flut-fight)
         :trans (new 'static 'vector :x -151263.64 :y 49150.363 :z -1020328.4 :w 1.0)
         :camera-trans (new 'static 'vector :x -109073.2 :y 90724.35 :z -991319.6 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x6e8c 0 -16511))
@@ -17222,7 +17222,7 @@
       (new 'static 'continue-point
         :name "volcano-indax-1"
         :level 'volcanoa
-        :flags (continue-flags no-auto pilot-dax cf27)
+        :flags (continue-flags no-auto indax indax-hang)
         :trans (new 'static 'vector :x 98610.38 :y 113585.36 :z 52110.95 :w 1.0)
         :camera-trans (new 'static 'vector :x 114574.13 :y 117680.945 :z 48513.434 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -23674 0 #x587b))
@@ -17271,7 +17271,7 @@
       (new 'static 'continue-point
         :name "volcano-post-rock-collapse"
         :level 'volcanoa
-        :flags (continue-flags no-auto pilot-dax)
+        :flags (continue-flags no-auto indax)
         :trans (new 'static 'vector :x 308310.03 :y 75210.75 :z 362059.38 :w 1.0)
         :camera-trans (new 'static 'vector :x 312644.8 :y 93494.88 :z 402524.16 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -31790 0 #x1ef6))
@@ -17343,7 +17343,7 @@
       (new 'static 'continue-point
         :name "volcano-indax-2"
         :level 'volcanoa
-        :flags (continue-flags no-auto pilot-dax)
+        :flags (continue-flags no-auto indax)
         :trans (new 'static 'vector :x -355248.94 :y 51808.664 :z 562249.75 :w 1.0)
         :camera-trans (new 'static 'vector :x -331340.6 :y 73882.83 :z 515073.22 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -8093 0 #x7c03))
@@ -17379,7 +17379,7 @@
       (new 'static 'continue-point
         :name "volcano-post-rock-fall"
         :level 'volcanoa
-        :flags (continue-flags no-auto pilot-dax)
+        :flags (continue-flags no-auto indax)
         :trans (new 'static 'vector :x -310118.4 :y 24563.303 :z 435816.03 :w 1.0)
         :camera-trans (new 'static 'vector :x -283636.53 :y 44336.742 :z 473550.44 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -17029 0 -27992))
@@ -17801,7 +17801,7 @@
                    :continues '((new 'static 'continue-point
                        :name "factoryb-start"
                        :level 'factoryb
-                       :flags (continue-flags record-path)
+                       :flags (continue-flags race)
                        :trans (new 'static 'vector :x 2412732.8 :y 1672502.9 :z 1152467.0 :w 1.0)
                        :camera-trans (new 'static 'vector :x 2467814.5 :y 1699122.8 :z 1153842.0 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -23457 0 #x595a))
@@ -17888,7 +17888,7 @@
       (new 'static 'continue-point
         :name "factory-indax-1"
         :level 'factoryc
-        :flags (continue-flags no-auto pilot-dax cf27)
+        :flags (continue-flags no-auto indax indax-hang)
         :trans (new 'static 'vector :x 1049604.9 :y 1803550.8 :z 163024.89 :w 1.0)
         :camera-trans (new 'static 'vector :x 1049816.6 :y 1807641.0 :z 177547.27 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7fe8 0 #x4c6))
@@ -17943,7 +17943,7 @@
       (new 'static 'continue-point
         :name "factory-indax-2"
         :level 'factoryc
-        :flags (continue-flags no-auto pilot-dax cf27)
+        :flags (continue-flags no-auto indax indax-hang)
         :trans (new 'static 'vector :x 1145705.2 :y 1860880.4 :z -784490.9 :w 1.0)
         :camera-trans (new 'static 'vector :x 1125859.8 :y 1865584.2 :z -784731.75 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -25725 0 -20289))
@@ -17980,7 +17980,7 @@
       (new 'static 'continue-point
         :name "factory-mid-indax-2"
         :level 'factoryc
-        :flags (continue-flags no-auto pilot-dax)
+        :flags (continue-flags no-auto indax)
         :trans (new 'static 'vector :x 986074.75 :y 1794785.8 :z -887165.75 :w 1.0)
         :camera-trans (new 'static 'vector :x 1006656.7 :y 1807682.4 :z -883927.9 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x4e5f 0 #x652e))
@@ -18042,7 +18042,7 @@
       (new 'static 'continue-point
         :name "factory-indax-3"
         :level 'factoryc
-        :flags (continue-flags no-auto pilot-dax cf27)
+        :flags (continue-flags no-auto indax indax-hang)
         :trans (new 'static 'vector :x 99605.71 :y 1934690.2 :z -533456.06 :w 1.0)
         :camera-trans (new 'static 'vector :x 100997.94 :y 1938784.6 :z -549898.25 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x49b 0 #x7fe8))
@@ -18097,7 +18097,7 @@
       (new 'static 'continue-point
         :name "factory-indax-4"
         :level 'factoryc
-        :flags (continue-flags no-auto pilot-dax cf27)
+        :flags (continue-flags no-auto indax indax-hang)
         :trans (new 'static 'vector :x 403773.84 :y 1836318.8 :z 118652.516 :w 1.0)
         :camera-trans (new 'static 'vector :x 413420.75 :y 1840411.9 :z 105407.695 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x1bda 0 -31980))
@@ -18383,7 +18383,7 @@
                   :continues '((new 'static 'continue-point
                       :name "precura-mech"
                       :level 'precura
-                      :flags (continue-flags scene-wait no-auto record-sig)
+                      :flags (continue-flags scene-wait no-auto mech)
                       :trans (new 'static 'vector :x 35848.6 :y 2258200.5 :z -445852.06 :w 1.0)
                       :camera-trans (new 'static 'vector :x 33189.477 :y 2277744.8 :z -400387.7 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7fca 0 #x72a))
@@ -18401,7 +18401,7 @@
                     (new 'static 'continue-point
                       :name "precura-mech-end"
                       :level 'precura
-                      :flags (continue-flags no-auto record-sig)
+                      :flags (continue-flags no-auto mech)
                       :trans (new 'static 'vector :x -844862.25 :y 2187819.5 :z -296978.44 :w 1.0)
                       :camera-trans (new 'static 'vector :x -823754.75 :y 2221199.8 :z -277565.44 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7765 0 -11805))
diff --git a/goal_src/jak3/engine/target/target-darkjak.gc b/goal_src/jak3/engine/target/target-darkjak.gc
index 26867cb5d71..be8b937363e 100644
--- a/goal_src/jak3/engine/target/target-darkjak.gc
+++ b/goal_src/jak3/engine/target/target-darkjak.gc
@@ -784,7 +784,7 @@
                                                )
                         )
                    )
-              (or (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
+              (or (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
                   (not (-> *setting-control* user-current darkjak))
                   (not (logtest? (the-as game-feature (logand (game-feature darkjak) (-> *setting-control* user-current features)))
                                  (-> self game features)
@@ -971,21 +971,21 @@
     (target-lightjak-end-mode #t)
     (set! (-> self darkjak latch-out-time) 0)
     (set! (-> self lightjak get-off-lock) #f)
-    (set! (-> self darkjak stage) (logior arg0 (darkjak-stage bomb0)))
+    (set! (-> self darkjak stage) (logior arg0 (darkjak-stage active)))
     (if (logtest? (game-feature darkjak-bomb0) (-> self game features))
-        (logior! (-> self darkjak stage) (darkjak-stage invinc))
+        (logior! (-> self darkjak stage) (darkjak-stage bomb0))
         )
     (if (logtest? (game-feature darkjak-bomb1) (-> self game features))
-        (logior! (-> self darkjak stage) (darkjak-stage giant))
+        (logior! (-> self darkjak stage) (darkjak-stage bomb1))
         )
-    (if (logtest? (game-feature feature45) (-> self game features))
-        (logior! (-> self darkjak stage) (darkjak-stage disable-force-on))
+    (if (logtest? (game-feature darkjak-invinc) (-> self game features))
+        (logior! (-> self darkjak stage) (darkjak-stage invinc))
         )
-    (if (logtest? (game-feature feature44) (-> self game features))
-        (logior! (-> self darkjak stage) (darkjak-stage no-anim))
+    (if (logtest? (game-feature darkjak-tracking) (-> self game features))
+        (logior! (-> self darkjak stage) (darkjak-stage tracking))
         )
     (if (logtest? (game-feature darkjak-smack) (-> self game features))
-        (logior! (-> self darkjak stage) (darkjak-stage bomb1))
+        (logior! (-> self darkjak stage) (darkjak-stage smack))
         )
     (set! (-> self darkjak want-stage) (-> self darkjak stage))
     (set! (-> self neck flex-blend) 0.0)
@@ -1000,20 +1000,20 @@
     (set! (-> self darkjak mode-sound-bank) (add-setting! 'mode-sound-bank 'modedark 0.0 0))
     (set! (-> self darkjak lightning-count) 0)
     (cond
-      ((logtest? (-> self darkjak stage) (darkjak-stage ds8))
+      ((logtest? (-> self darkjak stage) (darkjak-stage invis))
        (logclear! (-> self target-flags) (target-flags tf4))
-       (logclear! (-> self darkjak stage) (darkjak-stage bomb1 invinc giant no-anim disable-force-on))
+       (logclear! (-> self darkjak stage) (darkjak-stage smack bomb0 bomb1 tracking invinc))
        (target-invisible-start (-> *TARGET-bank* invisible-duration))
        (set! (-> self fact darkjak-effect-time) (-> *TARGET-bank* invisible-duration))
        )
-      ((logtest? (-> self darkjak stage) (darkjak-stage disable-force-on))
+      ((logtest? (-> self darkjak stage) (darkjak-stage invinc))
        (logior! (-> self target-flags) (target-flags tf4))
        )
       (else
         (logclear! (-> self target-flags) (target-flags tf4))
         )
       )
-    (if (logtest? arg0 (darkjak-stage ds9))
+    (if (logtest? arg0 (darkjak-stage no-anim))
         (go target-stance)
         )
     (target-start-attack)
@@ -1244,7 +1244,7 @@
          )
        (target-start-attack)
        (target-danger-set! 'punch #f)
-       (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
+       (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
            (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-punch-inc)))
            )
        (let ((a0-11 (-> self control impact-ctrl))
@@ -1279,7 +1279,7 @@
                (not (logtest? (-> self control current-surface flags) (surface-flag no-attack)))
                (and (focus-test? self dark)
                     (nonzero? (-> self darkjak))
-                    (logtest? (-> self darkjak stage) (darkjak-stage bomb0))
+                    (logtest? (-> self darkjak stage) (darkjak-stage active))
                     )
                (< sv-32 2)
                )
@@ -1298,7 +1298,7 @@
              ((arg0 (pointer float)) (arg1 (pointer int64)) (arg2 (pointer int64)))
              (let ((s3-0 (if (and (focus-test? self dark)
                                   (nonzero? (-> self darkjak))
-                                  (logtest? (-> self darkjak stage) (darkjak-stage no-anim))
+                                  (logtest? (-> self darkjak stage) (darkjak-stage tracking))
                                   )
                              (combo-tracker-method-13
                                (-> self control unknown-combo-tracker00)
@@ -1324,7 +1324,7 @@
                      )
                  (target-start-attack)
                  (target-danger-set! 'punch #f)
-                 (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
+                 (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
                      (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-punch-inc)))
                      )
                  (let ((v1-34 (ja-group)))
@@ -1696,7 +1696,7 @@
   :code (behavior ()
     (target-start-attack)
     (target-danger-set! 'dark-smack #f)
-    (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
+    (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
         (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-smack-inc)))
         )
     (set! (-> self control lightjak-sound-id) (sound-play "djak-pnch-swing"))
diff --git a/goal_src/jak3/engine/target/target-death.gc b/goal_src/jak3/engine/target/target-death.gc
index 658e23b6592..3e448568840 100644
--- a/goal_src/jak3/engine/target/target-death.gc
+++ b/goal_src/jak3/engine/target/target-death.gc
@@ -20,7 +20,7 @@
              (a3-0 (car a2-2))
              )
         (while (not (null? a2-2))
-          (if (and v1-0 (logtest? (continue-flags continue-flag-16) (-> (the-as continue-point a3-0) flags)))
+          (if (and v1-0 (logtest? (continue-flags test) (-> (the-as continue-point a3-0) flags)))
               (return (the-as continue-point a3-0))
               )
           (if (= a3-0 arg0)
@@ -41,12 +41,9 @@
 (defbehavior arrive-at-continue target ((arg0 continue-point))
   (cond
     ((logtest? (-> arg0 flags) (continue-flags title))
-     enter-state
-     #t
      (go target-title #t)
      )
     ((logtest? (-> arg0 flags) (continue-flags title-movie))
-     enter-state
      (go target-title #f)
      )
     ((logtest? (-> arg0 flags) (continue-flags intro))
@@ -75,23 +72,23 @@
          )
        )
      )
-    ((logtest? (continue-flags pilot-dax) (-> arg0 flags))
-     (go target-indax-start (the-as handle #f) (if (logtest? (continue-flags cf27) (-> arg0 flags))
+    ((logtest? (continue-flags indax) (-> arg0 flags))
+     (go target-indax-start (the-as handle #f) (if (logtest? (continue-flags indax-hang) (-> arg0 flags))
                                                    'hang
                                                    #t
                                                    )
          )
      )
-    ((logtest? (continue-flags cf23) (-> arg0 flags))
+    ((logtest? (continue-flags flut) (-> arg0 flags))
      (go target-flut-start (the-as handle #f) 'normal -1)
      )
-    ((logtest? (continue-flags cf24) (-> arg0 flags))
+    ((logtest? (continue-flags flut-racer) (-> arg0 flags))
      (go target-flut-start (the-as handle #f) 'racer -1)
      )
-    ((logtest? (continue-flags cf28) (-> arg0 flags))
+    ((logtest? (continue-flags flut-fight) (-> arg0 flags))
      (go target-flut-start (the-as handle #f) 'fight -1)
      )
-    ((logtest? (continue-flags cf31) (-> arg0 flags))
+    ((logtest? (continue-flags lightjak) (-> arg0 flags))
      (send-event self 'get-pickup (pickup-type eco-pill-light) 100.0)
      (case (-> arg0 vehicle-type)
        ((38)
@@ -102,11 +99,11 @@
          )
        )
      )
-    ((logtest? (-> arg0 flags) (continue-flags demo-movie))
+    ((logtest? (-> arg0 flags) (continue-flags darkjak))
      (send-event self 'get-pickup (pickup-type eco-pill-dark) 100.0)
-     (go target-darkjak-get-on (darkjak-stage force-on bomb0 ds9))
+     (go target-darkjak-get-on (darkjak-stage force-on active no-anim))
      )
-    ((logtest? (continue-flags cf25) (-> arg0 flags))
+    ((logtest? (continue-flags vehicle) (-> arg0 flags))
      (label cfg-39)
      (let* ((v1-77 (-> arg0 vehicle-type))
             (s5-2
@@ -138,7 +135,7 @@
        (send-event (handle->process s5-2) 'pickup)
        )
      )
-    ((logtest? (continue-flags cf30) (-> arg0 flags))
+    ((logtest? (continue-flags vehicle-scorpion) (-> arg0 flags))
      (label cfg-84)
      (let ((gp-1 (process->handle
                    (search-process-tree *active-pool* (lambda ((arg0 process)) (type? arg0 scorpion-gun-manager)))
@@ -157,7 +154,7 @@
          )
        )
      )
-    ((logtest? (continue-flags cf29) (-> arg0 flags))
+    ((logtest? (continue-flags htorpedo) (-> arg0 flags))
      (label cfg-114)
      (let ((gp-2 (process->handle (search-process-tree *active-pool* (lambda ((arg0 process)) (type? arg0 htorpedo))))))
        (when (not (handle->process gp-2))
@@ -169,12 +166,12 @@
        (send-event self 'change-mode 'pilot-daxter (handle->process gp-2))
        )
      )
-    ((logtest? (continue-flags record-sig) (-> arg0 flags))
+    ((logtest? (continue-flags mech) (-> arg0 flags))
      (go target-mech-start (the-as handle #f) 100.0 #t)
      )
-    ((logtest? (continue-flags test) (-> arg0 flags))
+    ((logtest? (continue-flags nothing-apparently) (-> arg0 flags))
      )
-    ((logtest? (continue-flags pilot) (-> arg0 flags))
+    ((logtest? (continue-flags credits) (-> arg0 flags))
      (case (-> arg0 vehicle-type)
        ((41)
         (go target-credits 1)
@@ -190,7 +187,7 @@
          )
        )
      )
-    ((and (logtest? (continue-flags record-path) (-> arg0 flags)) (!= (-> arg0 vehicle-type) 27))
+    ((and (logtest? (continue-flags race) (-> arg0 flags)) (!= (-> arg0 vehicle-type) 27))
      (set! (-> self mode-cache) (the-as basic 'pilot))
      (set! (-> self mode-param1) (the-as handle #f))
      (set! (-> self mode-param2) (-> arg0 vehicle-type))
@@ -219,7 +216,7 @@
        )
      (set! (-> self mode-param3) (the-as uint #t))
      )
-    ((logtest? (-> arg0 flags) (continue-flags demo-end))
+    ((logtest? (-> arg0 flags) (continue-flags grab))
      (go target-grab 'stance)
      )
     (else
@@ -576,7 +573,7 @@
     (kill-persister *setting-control* (the-as engine-pers 'fail-dialog-volume) 'dialog-volume)
     (kill-persister *setting-control* (the-as engine-pers 'fail-music-volume) 'music-volume)
     (when (-> *setting-control* user-current render)
-      (when (not (logtest? (continue-flags no-blackout cf26) (-> arg0 flags)))
+      (when (not (logtest? (continue-flags no-blackout vehicle-movie) (-> arg0 flags)))
         (add-setting! 'bg-a 'abs 1.0 0)
         (set! (-> *setting-control* user-current bg-a) 1.0)
         )
@@ -594,7 +591,7 @@
     (set-setting! 'allow-progress #f 0.0 0)
     (set-setting! 'level-trans-time #f 0.0 0)
     (kill-persister *setting-control* (the-as engine-pers 'speech-control) 'speech-control)
-    (when (logtest? (continue-flags cf27) (-> arg0 flags))
+    (when (logtest? (continue-flags indax-hang) (-> arg0 flags))
       (set-setting! 'head-offset 'abs (meters 1) 0)
       (set-setting! 'foot-offset 'abs (meters -1) 0)
       (set-setting! 'target-height 'abs (meters 1.5) 0)
@@ -710,7 +707,7 @@
       (suspend)
       0
       )
-    (when (logtest? (continue-flags pilot-dax) (-> arg0 flags))
+    (when (logtest? (continue-flags indax) (-> arg0 flags))
       (while (!= (-> self ext-anim) (-> self pending-ext-anim))
         (suspend)
         )
@@ -772,7 +769,7 @@
     (set! *spawn-actors* #t)
     (set! *teleport* #t)
     (set! (-> *ACTOR-bank* birth-max) 1000)
-    (if (not (logtest? (continue-flags no-blackout cf26) (-> arg0 flags)))
+    (if (not (logtest? (continue-flags no-blackout vehicle-movie) (-> arg0 flags)))
         (set-blackout-frames (seconds 0.1))
         )
     (let* ((a0-128 *game-info*)
diff --git a/goal_src/jak3/engine/target/target-h.gc b/goal_src/jak3/engine/target/target-h.gc
index 34477307cb7..0e746637d14 100644
--- a/goal_src/jak3/engine/target/target-h.gc
+++ b/goal_src/jak3/engine/target/target-h.gc
@@ -50,15 +50,15 @@
   :bitfield #t
   :type uint32
   (force-on)
+  (endless-dark)
   (active)
+  (smack)
   (bomb0)
   (bomb1)
+  (tracking)
   (invinc)
-  (giant)
+  (invis)
   (no-anim)
-  (disable-force-on)
-  (ds8 8)
-  (ds9 9)
   )
 ;; ---darkjak-stage
 
diff --git a/goal_src/jak3/engine/target/target-handler.gc b/goal_src/jak3/engine/target/target-handler.gc
index 4093c6d3a51..8cdbe52c83b 100644
--- a/goal_src/jak3/engine/target/target-handler.gc
+++ b/goal_src/jak3/engine/target/target-handler.gc
@@ -1037,7 +1037,7 @@
        ((and (and (focus-test? self dark) (nonzero? (-> self darkjak)))
              (or (and (focus-test? self dark)
                       (nonzero? (-> self darkjak))
-                      (logtest? (-> self darkjak stage) (darkjak-stage disable-force-on))
+                      (logtest? (-> self darkjak stage) (darkjak-stage invinc))
                       )
                  (logtest? (process-mask crate) (-> arg0 mask))
                  )
diff --git a/goal_src/jak3/engine/target/target-lightjak.gc b/goal_src/jak3/engine/target/target-lightjak.gc
index c42280840c4..f69f4051e84 100644
--- a/goal_src/jak3/engine/target/target-lightjak.gc
+++ b/goal_src/jak3/engine/target/target-lightjak.gc
@@ -878,7 +878,7 @@
                  (set! (-> self lightjak lightjak-before-powerjak) (the-as symbol (-> self control unknown-spool-anim00)))
                  (case (-> self lightjak get-on-latch)
                    ((512)
-                    (go target-darkjak-get-on (darkjak-stage bomb0))
+                    (go target-darkjak-get-on (darkjak-stage active))
                     )
                    ((8)
                     (if (and (focus-test? self light) (nonzero? (-> self lightjak)))
diff --git a/goal_src/jak3/engine/target/target-util.gc b/goal_src/jak3/engine/target/target-util.gc
index 546457ca76a..873ca181f8d 100644
--- a/goal_src/jak3/engine/target/target-util.gc
+++ b/goal_src/jak3/engine/target/target-util.gc
@@ -636,7 +636,7 @@
        (set! (-> self control penetrate-using) (penetrate touch punch))
        (if (and (focus-test? self dark)
                 (nonzero? (-> self darkjak))
-                (logtest? (-> self darkjak stage) (darkjak-stage bomb0))
+                (logtest? (-> self darkjak stage) (darkjak-stage active))
                 )
            (logior! (-> self control penetrate-using) (penetrate dark-punch))
            )
diff --git a/goal_src/jak3/engine/target/target.gc b/goal_src/jak3/engine/target/target.gc
index ab3109f92c6..6bc4f5e0e6b 100644
--- a/goal_src/jak3/engine/target/target.gc
+++ b/goal_src/jak3/engine/target/target.gc
@@ -116,7 +116,7 @@
                (>= (-> self game eco-pill-dark) (-> *FACT-bank* darkjak-button-invis-inc))
                )
       (target-invisible-start (seconds 30))
-      (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
+      (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
           (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-button-invis-inc)))
           )
       )
@@ -258,7 +258,7 @@
                (>= (-> self game eco-pill-dark) (-> *FACT-bank* darkjak-button-invis-inc))
                )
       (target-invisible-start (seconds 30))
-      (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
+      (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
           (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-button-invis-inc)))
           )
       )
@@ -2030,7 +2030,7 @@
                (>= (-> self game eco-pill-dark) (-> *FACT-bank* darkjak-button-invis-inc))
                )
       (target-invisible-start (seconds 30))
-      (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
+      (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
           (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-button-invis-inc)))
           )
       )
@@ -2195,7 +2195,7 @@
     (target-start-attack)
     (target-danger-set! 'spin #f)
     (if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
-                 (logtest? (-> self darkjak stage) (darkjak-stage force-on active))
+                 (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
                  )
              )
         (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-spin-inc)))
@@ -2227,7 +2227,7 @@
     (let ((s5-0 jakb-attack-from-stance-ja)
           (gp-0 (if (and (focus-test? self dark)
                          (nonzero? (-> self darkjak))
-                         (logtest? (-> self darkjak stage) (darkjak-stage no-anim))
+                         (logtest? (-> self darkjak stage) (darkjak-stage tracking))
                          )
                     (combo-tracker-method-13
                       (-> self control unknown-combo-tracker00)
@@ -2717,7 +2717,7 @@
     (target-start-attack)
     (target-danger-set! 'punch #f)
     (if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
-                 (logtest? (-> self darkjak stage) (darkjak-stage force-on active))
+                 (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
                  )
              )
         (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-punch-inc)))
@@ -2974,7 +2974,7 @@
     (target-start-attack)
     (target-danger-set! 'spin-air #f)
     (if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
-                 (logtest? (-> self darkjak stage) (darkjak-stage force-on active))
+                 (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
                  )
              )
         (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-spin-inc)))
@@ -3169,7 +3169,7 @@
     (target-start-attack)
     (target-danger-set! 'uppercut #f)
     (if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
-                 (logtest? (-> self darkjak stage) (darkjak-stage force-on active))
+                 (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
                  )
              )
         (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-uppercut-inc)))
@@ -3254,7 +3254,7 @@
          )
         ((and (and (focus-test? self dark)
                    (nonzero? (-> self darkjak))
-                   (logtest? (-> self darkjak stage) (darkjak-stage giant))
+                   (logtest? (-> self darkjak stage) (darkjak-stage bomb1))
                    )
               (and (= (-> self ext-anim) (target-anim dark))
                    (logtest? (the-as game-feature (logand (game-feature darkjak-bomb1) (-> *setting-control* user-current features)))
@@ -3507,7 +3507,7 @@
        )
       ((and (and (focus-test? self dark)
                  (nonzero? (-> self darkjak))
-                 (logtest? (-> self darkjak stage) (darkjak-stage invinc))
+                 (logtest? (-> self darkjak stage) (darkjak-stage bomb0))
                  )
             (and (= (-> self ext-anim) (target-anim dark))
                  (logtest? (the-as game-feature (logand (game-feature darkjak-bomb0) (-> *setting-control* user-current features)))
@@ -3586,7 +3586,7 @@
         (when (or (and (= (-> self fact eco-type) 2) (>= (-> self fact eco-level) 1.0))
                   (and (focus-test? self dark)
                        (nonzero? (-> self darkjak))
-                       (logtest? (-> self darkjak stage) (darkjak-stage bomb0))
+                       (logtest? (-> self darkjak stage) (darkjak-stage active))
                        )
                   )
           (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.5))
@@ -3637,7 +3637,7 @@
       (target-start-attack)
       (target-danger-set! 'flop #f)
       (if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
-                   (logtest? (-> self darkjak stage) (darkjak-stage force-on active))
+                   (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
                    )
                )
           (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-flop-inc)))
diff --git a/goal_src/jak3/levels/common/race/race-manager.gc b/goal_src/jak3/levels/common/race/race-manager.gc
index e04a48debc2..6bf5ed479f9 100644
--- a/goal_src/jak3/levels/common/race/race-manager.gc
+++ b/goal_src/jak3/levels/common/race/race-manager.gc
@@ -1030,7 +1030,7 @@
          (s5-0 (-> gp-0 info))
          )
     (if (or (logtest? (-> s5-0 flags) (racer-info-flag rif0))
-            (logtest? (continue-flags record-path) (-> *game-info* last-continue flags))
+            (logtest? (continue-flags race) (-> *game-info* last-continue flags))
             )
         (logior! (-> gp-0 flags) (race-flag rf2))
         )
diff --git a/goal_src/jak3/levels/desert/wvehicle/wcar-rhino.gc b/goal_src/jak3/levels/desert/wvehicle/wcar-rhino.gc
index ad8e4d6977b..30a8ddd17be 100644
--- a/goal_src/jak3/levels/desert/wvehicle/wcar-rhino.gc
+++ b/goal_src/jak3/levels/desert/wvehicle/wcar-rhino.gc
@@ -186,14 +186,14 @@
 (defmethod vehicle-method-79 ((this v-rhino))
   (set! (-> this turbo-supply) 3.0)
   (seek! (-> this gun-kick) 0.0 (* 32768.0 (seconds-per-frame)))
-  (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
+  (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
     (set! (-> this jmod-gun-kick transform trans z) (-> this gun-kick))
     (quaternion-axis-angle! (-> s5-0 1) 1.0 0.0 0.0 (- (-> this gun-pitch)))
     (quaternion-axis-angle! (-> s5-0 2) 0.0 1.0 0.0 (-> this gun-yaw))
     (quaternion*! (-> this jmod-gun-turn rotation) (-> s5-0 2) (-> s5-0 1))
     )
   0
-  (let ((s5-1 (new 'stack-no-clear 'inline-array 'quaternion 2)))
+  (let ((s5-1 (new 'stack-no-clear 'inline-array 'quaternion 3)))
     (set-vector! (-> s5-1 2) 0.0 0.0 0.0 0.0)
     (dotimes (s4-0 (-> this info physics-model wheel-count))
       (let ((v1-8 (-> this wheel s4-0)))
diff --git a/goal_src/jak3/levels/desert/wvehicle/wcar-scorpion.gc b/goal_src/jak3/levels/desert/wvehicle/wcar-scorpion.gc
index bcb893e6411..28fd4e667b6 100644
--- a/goal_src/jak3/levels/desert/wvehicle/wcar-scorpion.gc
+++ b/goal_src/jak3/levels/desert/wvehicle/wcar-scorpion.gc
@@ -224,7 +224,7 @@
   (quaternion-axis-angle! (-> this jmod-gun-tilt transform quat) 1.0 0.0 0.0 (-> this gun-pitch))
   (quaternion-axis-angle! (-> this jmod-gun-turn rotation) 0.0 1.0 0.0 (+ 32768.0 (-> this gun-yaw)))
   0
-  (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
+  (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
     (set-vector! (-> s5-0 2) -1638.4 -1638.4 1638.4 1638.4)
     (dotimes (s4-0 (-> this info physics-model wheel-count))
       (let ((v1-9 (-> this wheel s4-0)))
diff --git a/goal_src/jak3/levels/desert/wvehicle/wcar-turtle.gc b/goal_src/jak3/levels/desert/wvehicle/wcar-turtle.gc
index a965aebc7a6..4f9a7fa0a78 100644
--- a/goal_src/jak3/levels/desert/wvehicle/wcar-turtle.gc
+++ b/goal_src/jak3/levels/desert/wvehicle/wcar-turtle.gc
@@ -120,7 +120,7 @@
          )
     (init-vf0-vector)
     (set-vector! (-> this root scale) 1.0 1.0 1.07 1.0)
-    (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
+    (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
       (set-vector! (-> s5-0 2) -3640.889 3640.889 3640.889 -3640.889)
       (dotimes (s4-0 (-> this info physics-model wheel-count))
         (let ((v1-6 (-> this wheel s4-0)))
diff --git a/goal_src/jak3/levels/desert/wvehicle/wcar.gc b/goal_src/jak3/levels/desert/wvehicle/wcar.gc
index 3418643c4d3..d855e607832 100644
--- a/goal_src/jak3/levels/desert/wvehicle/wcar.gc
+++ b/goal_src/jak3/levels/desert/wvehicle/wcar.gc
@@ -4040,7 +4040,7 @@
   )
 
 (defmethod vehicle-method-79 ((this wcar-snake-base))
-  (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
+  (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
     (set-vector! (-> s5-0 2) 1092.2667 1092.2667 0.0 0.0)
     (dotimes (s4-0 (-> this info physics-model wheel-count))
       (let ((s3-0 (-> this wheel s4-0)))
diff --git a/goal_src/jak3/levels/mhcity/destroy-dark-eco.gc b/goal_src/jak3/levels/mhcity/destroy-dark-eco.gc
index 16cbd86cd32..15b986e7fab 100644
--- a/goal_src/jak3/levels/mhcity/destroy-dark-eco.gc
+++ b/goal_src/jak3/levels/mhcity/destroy-dark-eco.gc
@@ -248,7 +248,7 @@
     (task-node-close! (game-task-node city-destroy-darkeco-dark-punch) 'event)
     (set-setting! 'airlock #f 0.0 0)
     (suspend)
-    (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 ds9))
+    (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active no-anim))
     )
   )
 
@@ -1213,7 +1213,7 @@
              *target*
              (not (logtest? (focus-status dark) (-> *target* focus-status)))
              )
-        (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
+        (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
         )
     (let ((t9-3 (-> (find-parent-state) trans)))
       (if t9-3
diff --git a/goal_src/jak3/levels/wascity/wasstadium/wasstadc-obs.gc b/goal_src/jak3/levels/wascity/wasstadium/wasstadc-obs.gc
index 59d5799cf99..ed14d04b23d 100644
--- a/goal_src/jak3/levels/wascity/wasstadium/wasstadc-obs.gc
+++ b/goal_src/jak3/levels/wascity/wasstadium/wasstadc-obs.gc
@@ -2391,7 +2391,7 @@
       (persist-with-delay *setting-control* 'gun (seconds 0.1) 'gun #f 0.0 0)
       (persist-with-delay *setting-control* 'board (seconds 0.1) 'board #f 0.0 0)
       (when (and *target* (not (logtest? (focus-status dark) (-> *target* focus-status))))
-        (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
+        (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
         (send-event (ppointer->process *crowd-manager*) 'darkjak)
         )
       )
@@ -2446,7 +2446,7 @@
         (persist-with-delay *setting-control* 'gun (seconds 0.1) 'gun #f 0.0 0)
         (persist-with-delay *setting-control* 'board (seconds 0.1) 'board #f 0.0 0)
         (if (and *target* (not (logtest? (focus-status dark) (-> *target* focus-status))))
-            (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
+            (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
             )
         (suspend)
         )
@@ -2521,7 +2521,7 @@
         (persist-with-delay *setting-control* 'gun (seconds 0.1) 'gun #f 0.0 0)
         (persist-with-delay *setting-control* 'board (seconds 0.1) 'board #f 0.0 0)
         (if (and *target* (not (logtest? (focus-status dark) (-> *target* focus-status))))
-            (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
+            (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
             )
         )
       )
diff --git a/test/decompiler/reference/jak3/engine/debug/default-menu_REF.gc b/test/decompiler/reference/jak3/engine/debug/default-menu_REF.gc
index 636e583c5f8..85ce2649a76 100644
--- a/test/decompiler/reference/jak3/engine/debug/default-menu_REF.gc
+++ b/test/decompiler/reference/jak3/engine/debug/default-menu_REF.gc
@@ -2849,7 +2849,7 @@
                     (a0-5 arg1)
                     )
                 (when (if (= a0-5 'test)
-                          (logtest? (continue-flags continue-flag-16) (-> (the-as continue-point v1-2) flags))
+                          (logtest? (continue-flags test) (-> (the-as continue-point v1-2) flags))
                           #t
                           )
                   (let ((s2-0 (method-of-type pair new))
@@ -4420,7 +4420,7 @@
                   (set! (-> *game-info* debug-features)
                         (the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
                         )
-                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
                   )
                )
              (function
@@ -4511,7 +4511,7 @@
                   (set! (-> *game-info* features)
                         (the-as
                           game-feature
-                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
+                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
                                   (-> *game-info* features)
                                   )
                           )
@@ -4519,7 +4519,7 @@
                   (set! (-> *game-info* debug-features)
                         (the-as
                           game-feature
-                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
+                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
                                   (-> *game-info* debug-features)
                                   )
                           )
@@ -4534,7 +4534,7 @@
                   (set! (-> *game-info* features)
                         (the-as
                           game-feature
-                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
+                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
                                   (-> *game-info* features)
                                   )
                           )
@@ -4542,13 +4542,13 @@
                   (set! (-> *game-info* debug-features)
                         (the-as
                           game-feature
-                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 feature44 feature45)
+                          (logior (game-feature darkjak darkjak-smack darkjak-bomb0 darkjak-bomb1 darkjak-tracking darkjak-invinc)
                                   (-> *game-info* debug-features)
                                   )
                           )
                         )
                   (send-event *target* 'get-pickup (pickup-type eco-pill-dark) 100.0)
-                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage active bomb0 no-anim disable-force-on))
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage endless-dark active tracking invinc))
                   )
                )
              (function
@@ -4564,7 +4564,7 @@
                   (set! (-> *game-info* debug-features)
                         (the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
                         )
-                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
                   )
                )
              (function
@@ -4580,14 +4580,14 @@
                   (set! (-> *game-info* debug-features)
                         (the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
                         )
-                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage bomb0))
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage active))
                   )
                )
              (function "smack" #f ,(lambda ((arg0 int) (arg1 debug-menu-msg) (arg2 float))
                                      (if (not *target*)
                                          (start 'debug (get-current-continue-forced *game-info*))
                                          )
-                                     (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1))
+                                     (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack))
                                      )
                        )
              (function
@@ -4597,7 +4597,7 @@
                   (if (not *target*)
                       (start 'debug (get-current-continue-forced *game-info*))
                       )
-                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1 invinc))
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack bomb0))
                   )
                )
              (function
@@ -4607,7 +4607,7 @@
                   (if (not *target*)
                       (start 'debug (get-current-continue-forced *game-info*))
                       )
-                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1 invinc giant))
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack bomb0 bomb1))
                   )
                )
              (function
@@ -4617,7 +4617,7 @@
                   (if (not *target*)
                       (start 'debug (get-current-continue-forced *game-info*))
                       )
-                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 bomb1 invinc giant no-anim))
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active smack bomb0 bomb1 tracking))
                   )
                )
              (function
@@ -4627,13 +4627,7 @@
                   (if (not *target*)
                       (start 'debug (get-current-continue-forced *game-info*))
                       )
-                  (send-event
-                    *target*
-                    'change-mode
-                    'darkjak
-                    #f
-                    (darkjak-stage force-on bomb0 invinc giant no-anim disable-force-on)
-                    )
+                  (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active bomb0 bomb1 tracking invinc))
                   )
                )
              )
@@ -7023,7 +7017,7 @@
               (set! (-> *game-info* debug-features)
                     (the-as game-feature (logior (game-feature darkjak) (-> *game-info* debug-features)))
                     )
-              (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
+              (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
               )
            )
          (function
diff --git a/test/decompiler/reference/jak3/engine/game/game-info_REF.gc b/test/decompiler/reference/jak3/engine/game/game-info_REF.gc
index 277e85640f9..57ff6afd999 100644
--- a/test/decompiler/reference/jak3/engine/game/game-info_REF.gc
+++ b/test/decompiler/reference/jak3/engine/game/game-info_REF.gc
@@ -2183,8 +2183,8 @@
                              darkjak-smack
                              darkjak-bomb0
                              darkjak-bomb1
-                             feature44
-                             feature45
+                             darkjak-tracking
+                             darkjak-invinc
                              lightjak
                              lightjak-regen
                              lightjak-swoop
diff --git a/test/decompiler/reference/jak3/engine/game/main_REF.gc b/test/decompiler/reference/jak3/engine/game/main_REF.gc
index e5596a91af1..dc3cdea4175 100644
--- a/test/decompiler/reference/jak3/engine/game/main_REF.gc
+++ b/test/decompiler/reference/jak3/engine/game/main_REF.gc
@@ -1232,8 +1232,8 @@
                               darkjak-smack
                               darkjak-bomb0
                               darkjak-bomb1
-                              feature44
-                              feature45
+                              darkjak-tracking
+                              darkjak-invinc
                               lightjak
                               lightjak-regen
                               lightjak-swoop
diff --git a/test/decompiler/reference/jak3/engine/game/task/task-control_REF.gc b/test/decompiler/reference/jak3/engine/game/task/task-control_REF.gc
index 5e13bfd1fdb..6535e93e3c0 100644
--- a/test/decompiler/reference/jak3/engine/game/task/task-control_REF.gc
+++ b/test/decompiler/reference/jak3/engine/game/task/task-control_REF.gc
@@ -334,7 +334,7 @@
       )
     (if (logtest? (game-secrets darkjak-tracking) (-> *game-info* secrets))
         (set! (-> *game-info* features)
-              (the-as game-feature (logior (game-feature feature44) (-> *game-info* features)))
+              (the-as game-feature (logior (game-feature darkjak-tracking) (-> *game-info* features)))
               )
         )
     (logior! (-> *game-info* features) (-> *game-info* debug-features))
@@ -804,7 +804,7 @@
             ((= (status-of-level-and-borrows *level* 'wasall #f) 'active)
              (set! gp-1 "wasdoors-desert")
              (if (and (-> *game-info* current-continue)
-                      (logtest? (continue-flags record-path) (-> *game-info* current-continue flags))
+                      (logtest? (continue-flags race) (-> *game-info* current-continue flags))
                       )
                  (set! gp-1 (-> *game-info* current-continue name))
                  )
@@ -1395,12 +1395,12 @@
        )
       (((game-task-node-command add-darkjak-tracking))
        (set! (-> *game-info* features)
-             (the-as game-feature (logior (game-feature feature44) (-> *game-info* features)))
+             (the-as game-feature (logior (game-feature darkjak-tracking) (-> *game-info* features)))
              )
        )
       (((game-task-node-command add-darkjak-invinc))
        (set! (-> *game-info* features)
-             (the-as game-feature (logior (game-feature feature45) (-> *game-info* features)))
+             (the-as game-feature (logior (game-feature darkjak-invinc) (-> *game-info* features)))
              )
        )
       (((game-task-node-command add-lighteco))
@@ -3484,7 +3484,3 @@
       )
     )
   )
-
-
-
-
diff --git a/test/decompiler/reference/jak3/engine/level/level-info_REF.gc b/test/decompiler/reference/jak3/engine/level/level-info_REF.gc
index 25d475c76b0..45944f98ca9 100644
--- a/test/decompiler/reference/jak3/engine/level/level-info_REF.gc
+++ b/test/decompiler/reference/jak3/engine/level/level-info_REF.gc
@@ -149,7 +149,7 @@
                   (new 'static 'continue-point
                     :name "title-from-intro"
                     :level 'title
-                    :flags (continue-flags title cf26)
+                    :flags (continue-flags title vehicle-movie)
                     :trans (new 'static 'vector :x 4014080.0 :y 348160.0 :z 1417216.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x 76871.68 :y 55061.707 :z -938752.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 0 0 #x7fff))
@@ -193,7 +193,7 @@
                   (new 'static 'continue-point
                     :name "title-credits"
                     :level 'title
-                    :flags (continue-flags scene-wait pilot)
+                    :flags (continue-flags scene-wait credits)
                     :trans (new 'static 'vector :x 4014080.0 :y 348160.0 :z 1417216.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x 76871.68 :y 55061.707 :z -938752.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 0 0 #x7fff))
@@ -213,7 +213,7 @@
                   (new 'static 'continue-point
                     :name "title-museum1"
                     :level 'title
-                    :flags (continue-flags scene-wait pilot)
+                    :flags (continue-flags scene-wait credits)
                     :trans (new 'static 'vector :x 4014080.0 :y 348160.0 :z 1417216.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x 76871.68 :y 55061.707 :z -938752.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 0 0 #x7fff))
@@ -233,7 +233,7 @@
                   (new 'static 'continue-point
                     :name "title-museum2"
                     :level 'title
-                    :flags (continue-flags scene-wait pilot)
+                    :flags (continue-flags scene-wait credits)
                     :trans (new 'static 'vector :x 4014080.0 :y 348160.0 :z 1417216.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x 76871.68 :y 55061.707 :z -938752.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 0 0 #x7fff))
@@ -253,7 +253,7 @@
                   (new 'static 'continue-point
                     :name "title-museum3"
                     :level 'title
-                    :flags (continue-flags scene-wait pilot)
+                    :flags (continue-flags scene-wait credits)
                     :trans (new 'static 'vector :x 4014080.0 :y 348160.0 :z 1417216.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x 76871.68 :y 55061.707 :z -938752.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 0 0 #x7fff))
@@ -1311,7 +1311,7 @@
                   :continues '((new 'static 'continue-point
                       :name "ctygenb-start"
                       :level 'ctygenb
-                      :flags (continue-flags continue-flag-16)
+                      :flags (continue-flags test)
                       :trans (new 'static 'vector :x 686539.56 :y 40271.87 :z -1015174.75 :w 1.0)
                       :camera-trans (new 'static 'vector :x 647089.75 :y 59344.49 :z -1026199.94 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 29 #x53c6 22 -24771))
@@ -1465,7 +1465,7 @@
                     (new 'static 'continue-point
                       :name "ctygenb-mine"
                       :level 'ctygenb
-                      :flags (continue-flags continue-flag-16)
+                      :flags (continue-flags test)
                       :trans (new 'static 'vector :x 820940.8 :y 57328.844 :z -709940.8 :w 1.0)
                       :camera-trans (new 'static 'vector :x 776951.8 :y 77473.38 :z -728203.7 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -26 #x4d03 -36 -26171))
@@ -1572,7 +1572,7 @@
                      (new 'static 'continue-point
                        :name "ctysluma-alley"
                        :level 'ctysluma
-                       :flags (continue-flags scene-wait no-auto continue-flag-16)
+                       :flags (continue-flags scene-wait no-auto test)
                        :trans (new 'static 'vector :x 4721836.5 :y 32767.59 :z 730032.94 :w 1.0)
                        :camera-trans (new 'static 'vector :x 4756355.5 :y 53861.992 :z 692224.44 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -1690 0 #x7fd1))
@@ -1881,7 +1881,7 @@
                    :continues '((new 'static 'continue-point
                        :name "ctyslumc-start"
                        :level 'ctyslumc
-                       :flags (continue-flags continue-flag-16)
+                       :flags (continue-flags test)
                        :trans (new 'static 'vector :x 2453099.8 :y 7639.4497 :z -2268892.2 :w 1.0)
                        :camera-trans (new 'static 'vector :x 2476891.0 :y 28731.8 :z -2223565.2 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -22799 0 #x5bed))
@@ -1901,7 +1901,7 @@
                      (new 'static 'continue-point
                        :name "cty-blow-tower-mission"
                        :level 'ctyslumc
-                       :flags (continue-flags no-auto cf25)
+                       :flags (continue-flags no-auto vehicle)
                        :trans (new 'static 'vector :x 2453099.8 :y 32505.855 :z -2268892.8 :w 1.0)
                        :camera-trans (new 'static 'vector :x 2468703.8 :y 53571.586 :z -2220125.5 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -22799 0 #x5bed))
@@ -2088,7 +2088,7 @@
                     (new 'static 'continue-point
                       :name "ctyport-attack-start"
                       :level 'ctyport
-                      :flags (continue-flags no-auto cf29)
+                      :flags (continue-flags no-auto htorpedo)
                       :trans (new 'static 'vector :x -15787.622 :y 31600.64 :z 5435375.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x -65070.695 :y 52750.336 :z 5449853.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -15249 -42 -28998))
@@ -2147,7 +2147,7 @@
                     (new 'static 'continue-point
                       :name "ctyport-hijack-decoy"
                       :level 'ctyport
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 3025313.5 :y 59706.98 :z 5450023.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 3059521.2 :y 79520.56 :z 5402437.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -190 #x27db -3 -31135))
@@ -2167,7 +2167,7 @@
                     (new 'static 'continue-point
                       :name "ctyport-blow-tower"
                       :level 'ctyport
-                      :flags (continue-flags no-auto cf25)
+                      :flags (continue-flags no-auto vehicle)
                       :trans (new 'static 'vector :x 2356080.8 :y 36182.836 :z 6030970.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x 2356080.8 :y 48470.836 :z 6030970.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -12847 0 #x75bb))
@@ -2187,7 +2187,7 @@
                     (new 'static 'continue-point
                       :name "ctyport-hiphog"
                       :level 'ctyport
-                      :flags (continue-flags continue-flag-16)
+                      :flags (continue-flags test)
                       :trans (new 'static 'vector :x -237165.36 :y 31635.455 :z 5517031.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x -213388.9 :y 52731.086 :z 5552992.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -31813 0 #x1e97))
@@ -2383,7 +2383,7 @@
                     (new 'static 'continue-point
                       :name "ctyport-assault"
                       :level 'ctyport
-                      :flags (continue-flags continue-flag-16)
+                      :flags (continue-flags test)
                       :trans (new 'static 'vector :x -237165.36 :y 31635.455 :z 5517031.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x -213388.9 :y 52731.086 :z 5552992.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -31813 0 #x1e97))
@@ -2459,7 +2459,7 @@
                     (new 'static 'continue-point
                       :name "ctyport-bbush-port-4-missile"
                       :level 'ctyport
-                      :flags (continue-flags no-auto cf29)
+                      :flags (continue-flags no-auto htorpedo)
                       :trans (new 'static 'vector :x 2492384.8 :y 34605.055 :z 6578958.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x 2541912.0 :y 55486.875 :z 6565986.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 6 #x50b3 36 -25430))
@@ -2645,7 +2645,7 @@
                   :continues '((new 'static 'continue-point
                       :name "ctyinda-start"
                       :level 'ctyinda
-                      :flags (continue-flags continue-flag-16)
+                      :flags (continue-flags test)
                       :trans (new 'static 'vector :x 3945097.8 :y 110584.625 :z 3721824.8 :w 1.0)
                       :camera-trans (new 'static 'vector :x 3971861.0 :y 129763.734 :z 3686880.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x6d2 0 #x7fcd))
@@ -3285,7 +3285,7 @@
                    :continues '((new 'static 'continue-point
                        :name "stadiumb-start"
                        :level 'stadiumb
-                       :flags (continue-flags no-auto continue-flag-16)
+                       :flags (continue-flags no-auto test)
                        :trans (new 'static 'vector :x -71093.86 :y -46009.957 :z -2018556.4 :w 1.0)
                        :camera-trans (new 'static 'vector :x -122139.85 :y -24800.871 :z -2014586.0 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x4f86 0 #x6448))
@@ -3720,7 +3720,7 @@
                     (new 'static 'continue-point
                       :name "rubblea-rhino"
                       :level 'rubblea
-                      :flags (continue-flags scene-wait no-auto record-path)
+                      :flags (continue-flags scene-wait no-auto race)
                       :trans (new 'static 'vector :x -585186.94 :y 89194.086 :z -1169881.1 :w 1.0)
                       :camera-trans (new 'static 'vector :x -585855.4 :y 116445.59 :z -1221524.2 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x27e -219 #x223 -32753))
@@ -4257,7 +4257,7 @@
                    :continues '((new 'static 'continue-point
                        :name "onintent-start"
                        :level 'onintent
-                       :flags (continue-flags scene-wait continue-flag-16)
+                       :flags (continue-flags scene-wait test)
                        :trans (new 'static 'vector :x 3206013.0 :y 32764.314 :z 787585.44 :w 1.0)
                        :camera-trans (new 'static 'vector :x 3238502.5 :y 53785.805 :z 827149.1 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 72 #x75ad #x79 -12883))
@@ -4277,7 +4277,7 @@
                      (new 'static 'continue-point
                        :name "onintent-end"
                        :level 'onintent
-                       :flags (continue-flags scene-wait continue-flag-16)
+                       :flags (continue-flags scene-wait test)
                        :trans (new 'static 'vector :x 3185899.0 :y 33336.934 :z 742425.0 :w 1.0)
                        :camera-trans (new 'static 'vector :x 3181206.8 :y 47166.258 :z 765917.2 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 16 -7444 -42 #x7ca4))
@@ -4484,7 +4484,7 @@
                   :continues '((new 'static 'continue-point
                       :name "gungame-start"
                       :level 'gungame
-                      :flags (continue-flags continue-flag-16)
+                      :flags (continue-flags test)
                       :trans (new 'static 'vector :x 1506927.9 :y 34744.73 :z 5140666.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 1544226.4 :y 55298.867 :z 5109040.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x37be 0 -29493))
@@ -4504,7 +4504,7 @@
                     (new 'static 'continue-point
                       :name "gungame-movie"
                       :level 'gungame
-                      :flags (continue-flags continue-flag-16)
+                      :flags (continue-flags test)
                       :trans (new 'static 'vector :x 1506927.9 :y 34744.73 :z 5140666.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 1544226.4 :y 55298.867 :z 5109040.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x37be 0 -29493))
@@ -5509,7 +5509,7 @@
                   (new 'static 'continue-point
                     :name "comba-sled"
                     :level 'comba
-                    :flags (continue-flags no-auto record-path)
+                    :flags (continue-flags no-auto race)
                     :trans (new 'static 'vector :x 820601.6 :y -57798.246 :z 47158.887 :w 1.0)
                     :camera-trans (new 'static 'vector :x 777019.0 :y -32215.45 :z 44085.246 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x3f1 #x5a67 -1546 #x5a50))
@@ -5811,7 +5811,7 @@
                   (new 'static 'continue-point
                     :name "combn-lightjak"
                     :level 'combn
-                    :flags (continue-flags no-auto cf31)
+                    :flags (continue-flags no-auto lightjak)
                     :trans (new 'static 'vector :x 14608403.0 :y -164009.58 :z 608924.9 :w 1.0)
                     :camera-trans (new 'static 'vector :x 14557696.0 :y -142914.77 :z 616067.5 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x5a71 0 #x5a8e))
@@ -5921,7 +5921,7 @@
                 :continues '((new 'static 'continue-point
                     :name "railb-start"
                     :level 'railb
-                    :flags (continue-flags no-auto record-path)
+                    :flags (continue-flags no-auto race)
                     :trans (new 'static 'vector :x -694290.44 :y -128170.39 :z 4016339.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x -713932.8 :y 5734.4 :z 4112384.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x9ad -31423 #x22e1 #x1d1))
@@ -6121,7 +6121,7 @@
                 :continues '((new 'static 'continue-point
                     :name "raile-start"
                     :level 'raile
-                    :flags (continue-flags no-auto record-path)
+                    :flags (continue-flags no-auto race)
                     :trans (new 'static 'vector :x -196025.14 :y -9100242.0 :z 1043255.3 :w 1.0)
                     :camera-trans (new 'static 'vector :x -223124.69 :y -9055834.0 :z 1031985.1 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x8a7 -20852 #x2e10 -22242))
@@ -8603,7 +8603,7 @@
                  :continues '((new 'static 'continue-point
                      :name "wasall-start"
                      :level 'wasall
-                     :flags (continue-flags no-auto continue-flag-16)
+                     :flags (continue-flags no-auto test)
                      :trans (new 'static 'vector :x 9283373.0 :y 126422.22 :z 1057314.9 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9272728.0 :y 147014.05 :z 1009150.4 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -36 #x5dfc 22 #x56de))
@@ -8809,7 +8809,7 @@
                      (new 'static 'continue-point
                        :name "wascitya-start-flut"
                        :level 'wascitya
-                       :flags (continue-flags no-auto cf23)
+                       :flags (continue-flags no-auto flut)
                        :trans (new 'static 'vector :x 9234353.0 :y 27028.275 :z -281878.94 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9183710.0 :y 48123.496 :z -274296.84 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x62af 0 #x5182))
@@ -8829,7 +8829,7 @@
                      (new 'static 'continue-point
                        :name "wascitya-flut-racer"
                        :level 'wascitya
-                       :flags (continue-flags no-auto cf24)
+                       :flags (continue-flags no-auto flut-racer)
                        :trans (new 'static 'vector :x 9174756.0 :y 28741.633 :z -249075.72 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9152103.0 :y 49813.094 :z -203148.08 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -31633 0 -8532))
@@ -9093,7 +9093,7 @@
                      (new 'static 'continue-point
                        :name "wascityb-gungame-reset"
                        :level 'wascityb
-                       :flags (continue-flags no-auto cf25)
+                       :flags (continue-flags no-auto vehicle)
                        :trans (new 'static 'vector :x 6582161.0 :y 262058.8 :z -1938423.0 :w 1.0)
                        :camera-trans (new 'static 'vector :x 6580554.0 :y 282054.66 :z -1891336.6 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7ff8 0 -537))
@@ -9133,7 +9133,7 @@
                      (new 'static 'continue-point
                        :name "wascityb-defend-reset"
                        :level 'wascityb
-                       :flags (continue-flags no-auto cf25)
+                       :flags (continue-flags no-auto vehicle)
                        :trans (new 'static 'vector :x 6582161.0 :y 262058.8 :z -1938423.0 :w 1.0)
                        :camera-trans (new 'static 'vector :x 6580554.0 :y 282054.66 :z -1891336.6 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7ff8 0 -537))
@@ -9173,7 +9173,7 @@
                      (new 'static 'continue-point
                        :name "wascityb-flut"
                        :level 'wascityb
-                       :flags (continue-flags no-auto cf23)
+                       :flags (continue-flags no-auto flut)
                        :trans (new 'static 'vector :x 7209513.5 :y 128413.695 :z -1274676.0 :w 1.0)
                        :camera-trans (new 'static 'vector :x 7174367.5 :y 149534.72 :z -1237440.1 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 16 -29644 45 -13955))
@@ -9193,7 +9193,7 @@
                      (new 'static 'continue-point
                        :name "wascityb-flut-res"
                        :level 'wascityb
-                       :flags (continue-flags no-auto cf23)
+                       :flags (continue-flags no-auto flut)
                        :trans (new 'static 'vector :x 7209513.5 :y 128413.695 :z -1274676.0 :w 1.0)
                        :camera-trans (new 'static 'vector :x 7174367.5 :y 149534.72 :z -1237440.1 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 16 -29644 45 -13955))
@@ -9653,7 +9653,7 @@
                      (new 'static 'continue-point
                        :name "wasdoors-desert-any"
                        :level 'wasdoors
-                       :flags (continue-flags no-auto record-path)
+                       :flags (continue-flags no-auto race)
                        :trans (new 'static 'vector :x 9284744.0 :y 128190.875 :z 684149.56 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9281600.0 :y 149347.94 :z 632856.2 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #xc46 0 #x7f64))
@@ -9673,7 +9673,7 @@
                      (new 'static 'continue-point
                        :name "wasdoors-desert-turtle"
                        :level 'wasdoors
-                       :flags (continue-flags no-auto record-path)
+                       :flags (continue-flags no-auto race)
                        :trans (new 'static 'vector :x 9273955.0 :y 127025.97 :z 866910.6 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9274301.0 :y 148119.97 :z 815712.25 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 88 -6 #x7ffb))
@@ -9693,7 +9693,7 @@
                      (new 'static 'continue-point
                        :name "wasdoors-desert-snake"
                        :level 'wasdoors
-                       :flags (continue-flags no-auto record-path)
+                       :flags (continue-flags no-auto race)
                        :trans (new 'static 'vector :x 9273955.0 :y 127025.97 :z 866910.6 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9274301.0 :y 148119.97 :z 815712.25 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 88 -6 #x7ffb))
@@ -9713,7 +9713,7 @@
                      (new 'static 'continue-point
                        :name "wasdoors-desert-scorpion"
                        :level 'wasdoors
-                       :flags (continue-flags no-auto record-path)
+                       :flags (continue-flags no-auto race)
                        :trans (new 'static 'vector :x 9273955.0 :y 127025.97 :z 866910.6 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9274301.0 :y 148119.97 :z 815712.25 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 88 -6 #x7ffb))
@@ -9733,7 +9733,7 @@
                      (new 'static 'continue-point
                        :name "wasdoors-desert-toad"
                        :level 'wasdoors
-                       :flags (continue-flags no-auto record-path)
+                       :flags (continue-flags no-auto race)
                        :trans (new 'static 'vector :x 9273955.0 :y 127025.97 :z 866910.6 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9274301.0 :y 148119.97 :z 815712.25 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 88 -6 #x7ffb))
@@ -9753,7 +9753,7 @@
                      (new 'static 'continue-point
                        :name "wasdoors-artifact-race-1-intro-end"
                        :level 'wasdoors
-                       :flags (continue-flags no-auto record-path)
+                       :flags (continue-flags no-auto race)
                        :trans (new 'static 'vector :x 9360624.0 :y 126734.336 :z 718312.25 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9408733.0 :y 147828.33 :z 735797.7 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 6 -23749 -9 -22569))
@@ -9773,7 +9773,7 @@
                      (new 'static 'continue-point
                        :name "wasdoors-artifact-pre"
                        :level 'wasdoors
-                       :flags (continue-flags no-auto record-path)
+                       :flags (continue-flags no-auto race)
                        :trans (new 'static 'vector :x 9249314.0 :y 132965.17 :z 876837.7 :w 1.0)
                        :camera-trans (new 'static 'vector :x 9250625.0 :y 152384.31 :z 925827.9 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -19 #x7fa3 #xf2 #x972))
@@ -11986,7 +11986,7 @@
                  :continues '((new 'static 'continue-point
                      :name "desert-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9283373.0 :y 126422.22 :z 1057314.9 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9272728.0 :y 147014.05 :z 1009150.4 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -36 #x5dfc 22 #x56de))
@@ -12006,7 +12006,7 @@
                    (new 'static 'continue-point
                      :name "desert-facing-wasdoors"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9279752.0 :y 133643.47 :z 1020903.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9277506.0 :y 152359.33 :z 1061803.6 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x236 #x7fd7 -1238 #x329))
@@ -12026,7 +12026,7 @@
                    (new 'static 'continue-point
                      :name "desert-scorpion-gun"
                      :level 'desert
-                     :flags (continue-flags no-auto cf25)
+                     :flags (continue-flags no-auto vehicle)
                      :trans (new 'static 'vector :x 9340766.0 :y 124521.266 :z 1113647.1 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9339435.0 :y 150994.12 :z 1077943.1 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1782 #x6dc 72 #x7f9c))
@@ -12046,7 +12046,7 @@
                    (new 'static 'continue-point
                      :name "desert-scorpion-gun-1"
                      :level 'desert
-                     :flags (continue-flags no-auto cf25)
+                     :flags (continue-flags no-auto vehicle)
                      :trans (new 'static 'vector :x 14767914.0 :y 135374.84 :z 10136262.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 14798791.0 :y 157549.77 :z 10124173.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1068 #x309c #xb2f -30155))
@@ -12066,7 +12066,7 @@
                    (new 'static 'continue-point
                      :name "desert-scorpion-gun-2"
                      :level 'desert
-                     :flags (continue-flags no-auto cf25)
+                     :flags (continue-flags no-auto vehicle)
                      :trans (new 'static 'vector :x 6763618.0 :y 85138.64 :z 7983003.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 6794250.0 :y 116340.33 :z 7986813.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #xa7 #x6222 #xd1 -21033))
@@ -12086,7 +12086,7 @@
                    (new 'static 'continue-point
                      :name "desert-scorpion-gun-3"
                      :level 'desert
-                     :flags (continue-flags no-auto cf25)
+                     :flags (continue-flags no-auto vehicle)
                      :trans (new 'static 'vector :x 6181083.0 :y 176762.88 :z 2517364.8 :w 1.0)
                      :camera-trans (new 'static 'vector :x 6149136.5 :y 206138.16 :z 2514886.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x4d0 -20675 -2467 -25266))
@@ -12106,7 +12106,7 @@
                    (new 'static 'continue-point
                      :name "desert-start-any"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9266747.0 :y 123430.09 :z 1080473.6 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9254848.0 :y 142267.19 :z 1121516.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x989 -45 #x7fa3))
@@ -12126,7 +12126,7 @@
                    (new 'static 'continue-point
                      :name "desert-start-turtle"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9266747.0 :y 123430.09 :z 1080473.6 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9254848.0 :y 142267.19 :z 1121516.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x989 -45 #x7fa3))
@@ -12146,7 +12146,7 @@
                    (new 'static 'continue-point
                      :name "desert-start-snake"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9266747.0 :y 123430.09 :z 1080473.6 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9254848.0 :y 142267.19 :z 1121516.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x989 -45 #x7fa3))
@@ -12166,7 +12166,7 @@
                    (new 'static 'continue-point
                      :name "desert-start-scorpion"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9266747.0 :y 123430.09 :z 1080473.6 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9254848.0 :y 142267.19 :z 1121516.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x989 -45 #x7fa3))
@@ -12186,7 +12186,7 @@
                    (new 'static 'continue-point
                      :name "desert-start-toad"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9266747.0 :y 123430.09 :z 1080473.6 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9254848.0 :y 142267.19 :z 1121516.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x989 -45 #x7fa3))
@@ -12206,7 +12206,7 @@
                    (new 'static 'continue-point
                      :name "desert-lizard-corral"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12394307.0 :y 88917.61 :z 11457055.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12441473.0 :y 111239.17 :z 11463575.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1569 #x605e -383 -21498))
@@ -12226,7 +12226,7 @@
                    (new 'static 'continue-point
                      :name "desert-lizard-corral-snake-1"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12380978.0 :y 87472.945 :z 11469247.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12369225.0 :y 108464.54 :z 11428414.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1907 -5508 -186 -32242))
@@ -12246,7 +12246,7 @@
                    (new 'static 'continue-point
                      :name "desert-lizard-corral-snake-2"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12341135.0 :y 87567.98 :z 11455479.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12299867.0 :y 108794.266 :z 11481984.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x2e7 #x7051 -209 #x3d4c))
@@ -12286,7 +12286,7 @@
                    (new 'static 'continue-point
                      :name "desert-nest-exit"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9052358.0 :y 83284.375 :z 9085710.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 8994050.0 :y 108485.016 :z 9055392.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x648 -16583 -373 -28209))
@@ -12306,7 +12306,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desd"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 15651864.0 :y 142954.5 :z 2969713.8 :w 1.0)
                      :camera-trans (new 'static 'vector :x 15653079.0 :y 164021.45 :z 3020865.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 26 #x7ff1 42 #x31f))
@@ -12326,7 +12326,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desc"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 3534418.0 :y 324452.75 :z 5562998.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 3519780.8 :y 344942.2 :z 5609219.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -22 -7329 -45 #x7cbe))
@@ -12346,7 +12346,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desa"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 5621998.0 :y 387778.97 :z 3335355.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 5610284.0 :y 408866.4 :z 3385172.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -3 #x7fde -3 -1438))
@@ -12366,7 +12366,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desg"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12909726.0 :y 165722.52 :z 10295038.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12947606.0 :y 186825.94 :z 10260609.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x10a6 0 #x7ee5))
@@ -12386,7 +12386,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desh"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12774632.0 :y 82657.69 :z 14474145.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12733889.0 :y 102872.266 :z 14499264.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 39 #x722c 16 #x39da))
@@ -12406,7 +12406,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desc-2"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 6303633.5 :y 313270.7 :z 7291769.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 6265247.5 :y 334363.84 :z 7257888.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -32449 0 -4548))
@@ -12426,7 +12426,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-dese"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 2655081.8 :y 72562.69 :z 10620010.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 2629825.8 :y 93656.266 :z 10664537.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -19 -25125 39 -21029))
@@ -12446,7 +12446,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desb"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 11717245.0 :y 121844.94 :z 658854.7 :w 1.0)
                      :camera-trans (new 'static 'vector :x 11751063.0 :y 142225.0 :z 624211.94 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x546d 0 -24624))
@@ -12466,7 +12466,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desa-2"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 6977682.0 :y 59582.055 :z 419910.44 :w 1.0)
                      :camera-trans (new 'static 'vector :x 6965355.5 :y 80625.664 :z 469413.88 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -32747 0 #x41f))
@@ -12486,7 +12486,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desc-3"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 806166.94 :y 182831.11 :z 6544611.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 777256.1 :y 203924.69 :z 6586858.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -27956 0 -17087))
@@ -12506,7 +12506,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desg-2"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12397906.0 :y 211421.6 :z 12644173.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12430085.0 :y 232395.98 :z 12683393.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 26 -32747 36 #x446))
@@ -12526,7 +12526,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desd-2"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 8716551.0 :y 143261.7 :z 5828874.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 8747487.0 :y 163276.8 :z 5793088.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -11006 0 #x788b))
@@ -12546,7 +12546,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desg-3"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 11045927.0 :y 109553.664 :z 11712216.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 11031834.0 :y 130646.836 :z 11662982.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -3 #xf21 42 #x7f16))
@@ -12566,7 +12566,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-dese-2"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 895466.3 :y 246845.44 :z 12161362.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 909384.06 :y 267799.75 :z 12210177.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -6 -31908 -42 #x1d14))
@@ -12586,7 +12586,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-dese-3"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 521345.84 :y 184066.05 :z 15728497.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 470152.4 :y 205157.98 :z 15728644.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -49 #x61bc 13 #x52a2))
@@ -12606,7 +12606,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desd-3"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 16138061.0 :y 54162.227 :z 5788602.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 16187264.0 :y 75255.4 :z 5774467.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -32511 0 #xfe2))
@@ -12626,7 +12626,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desb-2"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 15965142.0 :y 136031.44 :z 1682779.8 :w 1.0)
                      :camera-trans (new 'static 'vector :x 16012997.0 :y 156281.66 :z 1687586.4 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x4350 0 -27868))
@@ -12686,7 +12686,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desg-4"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12706330.0 :y 108822.12 :z 10588652.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12738304.0 :y 129281.64 :z 10625536.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -16 #x680f -39 -19076))
@@ -12706,7 +12706,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desa-3"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 2468171.0 :y 379272.4 :z 2138876.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 2435880.5 :y 400365.97 :z 2099137.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -42 -16334 -9 -28402))
@@ -12744,7 +12744,7 @@
                    (new 'static 'continue-point
                      :name "desert-boss-res-b"
                      :level 'desert
-                     :flags (continue-flags scene-wait no-auto record-path)
+                     :flags (continue-flags scene-wait no-auto race)
                      :trans (new 'static 'vector :x 9283373.0 :y 126422.22 :z 1057314.9 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9272728.0 :y 147014.05 :z 1009150.4 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -36 #x5dfc 22 #x56de))
@@ -12764,7 +12764,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desd-4"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 11725399.0 :y 232726.94 :z 4029474.8 :w 1.0)
                      :camera-trans (new 'static 'vector :x 11763166.0 :y 252992.31 :z 4058293.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x3971 0 -29280))
@@ -12784,7 +12784,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desc-4"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 4222015.5 :y 415771.03 :z 7156819.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 4181632.5 :y 435030.03 :z 7138538.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 36 #x7a0e -26 -9856))
@@ -12804,7 +12804,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desc-5"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 6357256.0 :y 102379.93 :z 7768775.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 6314594.5 :y 122449.92 :z 7748192.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7816 0 -11330))
@@ -12824,7 +12824,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desb-3"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 11126602.0 :y 106112.2 :z 1197135.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 11075782.0 :y 127205.375 :z 1203468.2 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -28900 0 -15436))
@@ -12844,7 +12844,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-dese-1"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 2386897.2 :y 398680.06 :z 9587007.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 2384640.5 :y 418615.72 :z 9540191.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -39 #x2add 19 -30873))
@@ -12864,7 +12864,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desf"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 5015841.0 :y 98922.086 :z 13601529.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 4986208.0 :y 118892.95 :z 13565056.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -19 -15020 39 -29120))
@@ -12904,7 +12904,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desd-5"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10125926.0 :y 259614.72 :z 3781514.8 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10141447.0 :y 280705.84 :z 3732736.8 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -39 #x170d 3 #x7de5))
@@ -12924,7 +12924,7 @@
                    (new 'static 'continue-point
                      :name "desert-bbush-desb-4"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9106742.0 :y 100738.25 :z 3052560.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9059008.0 :y 121065.88 :z 3044976.2 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -3 #x6f96 6 #x3eae))
@@ -12944,7 +12944,7 @@
                    (new 'static 'continue-point
                      :name "desert-ba-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9174216.0 :y 123262.16 :z 2099533.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9208165.0 :y 144207.05 :z 2069216.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -616 #x32dd -724 -30050))
@@ -12964,7 +12964,7 @@
                    (new 'static 'continue-point
                      :name "desert-bd-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10815025.0 :y 102545.41 :z 2497923.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10818434.0 :y 121769.58 :z 2453239.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x4d9 -1218 -1536 #x7fa9))
@@ -12984,7 +12984,7 @@
                    (new 'static 'continue-point
                      :name "desert-ab-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 7087109.5 :y 88144.69 :z 2644712.8 :w 1.0)
                      :camera-trans (new 'static 'vector :x 7038387.0 :y 109325.11 :z 2643588.2 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x3ac #x5964 -969 #x5b74))
@@ -13004,7 +13004,7 @@
                    (new 'static 'continue-point
                      :name "desert-ac-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 5267694.0 :y 210627.78 :z 2727774.2 :w 1.0)
                      :camera-trans (new 'static 'vector :x 5280323.0 :y 233042.33 :z 2688289.2 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1808 #x13b2 -455 -32321))
@@ -13024,7 +13024,7 @@
                    (new 'static 'continue-point
                      :name "desert-ca-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 4264788.0 :y 114527.84 :z 5167032.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 4238144.5 :y 132585.88 :z 5203264.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x1ee #x797b -1320 #x27e8))
@@ -13044,7 +13044,7 @@
                    (new 'static 'continue-point
                      :name "desert-ce-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 1920403.5 :y 89246.92 :z 7647962.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 1943748.6 :y 111184.28 :z 7604075.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x820 -7939 #x425 #x7bd6))
@@ -13064,7 +13064,7 @@
                    (new 'static 'continue-point
                      :name "desert-cf-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 5517754.0 :y 81149.95 :z 7359357.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 5491709.0 :y 103704.984 :z 7316846.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -2650 -8706 -1612 -31433))
@@ -13084,7 +13084,7 @@
                    (new 'static 'continue-point
                      :name "desert-fc-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 5731188.5 :y 101824.516 :z 10538363.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 5730499.5 :y 122402.0 :z 10589314.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -593 -32757 -314 -196))
@@ -13104,7 +13104,7 @@
                    (new 'static 'continue-point
                      :name "desert-fe-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 5369364.5 :y 67309.98 :z 13836079.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 5406458.5 :y 89869.11 :z 13866195.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -822 #x7366 -1467 -14066))
@@ -13124,7 +13124,7 @@
                    (new 'static 'continue-point
                      :name "desert-ef-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 3065982.2 :y 107245.57 :z 11426490.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 3053326.0 :y 128890.88 :z 11377862.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1068 -5776 -1179 -32213))
@@ -13144,7 +13144,7 @@
                    (new 'static 'continue-point
                      :name "desert-ec-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 1982650.8 :y 104885.86 :z 10504566.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 2007108.0 :y 126636.85 :z 10547168.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x312 #x7ba4 -704 -8394))
@@ -13164,7 +13164,7 @@
                    (new 'static 'continue-point
                      :name "desert-fh-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 6646727.5 :y 105947.55 :z 14136369.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 6598880.5 :y 124606.875 :z 14129300.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1071 #x5a2f #x68 #x5ab5))
@@ -13184,7 +13184,7 @@
                    (new 'static 'continue-point
                      :name "desert-fg-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 7501026.0 :y 129638.81 :z 10855417.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 7452133.0 :y 148057.7 :z 10847204.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -520 -21141 #x2dd -25014))
@@ -13204,7 +13204,7 @@
                    (new 'static 'continue-point
                      :name "desert-gf-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10470927.0 :y 100597.35 :z 10559268.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10515771.0 :y 118994.125 :z 10536350.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x264 -17232 -242 #x6cd2))
@@ -13224,7 +13224,7 @@
                    (new 'static 'continue-point
                      :name "desert-gh-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 12397437.0 :y 88344.164 :z 11898591.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 12422467.0 :y 106747.086 :z 11855134.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #xef -8742 #x59b #x7b38))
@@ -13244,7 +13244,7 @@
                    (new 'static 'continue-point
                      :name "desert-hg-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10930610.0 :y 96485.375 :z 13800077.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10903110.0 :y 118353.51 :z 13832512.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x175 #x783d -196 #x2bd3))
@@ -13264,7 +13264,7 @@
                    (new 'static 'continue-point
                      :name "desert-hf-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 9955962.0 :y 89947.34 :z 14870607.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 9993292.0 :y 112116.94 :z 14840056.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x621 -13998 -599 #x7387))
@@ -13284,7 +13284,7 @@
                    (new 'static 'continue-point
                      :name "desert-htemple-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10506505.0 :y 97552.8 :z 13772963.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10492059.0 :y 120096.36 :z 13728261.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x7ce #x13c9 0 #x7e34))
@@ -13304,7 +13304,7 @@
                    (new 'static 'continue-point
                      :name "desert-gd-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10063119.0 :y 88970.445 :z 9741795.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10018427.0 :y 107390.98 :z 9765995.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -766 #x6b01 -969 #x460d))
@@ -13324,7 +13324,7 @@
                    (new 'static 'continue-point
                      :name "desert-dg-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10774611.0 :y 154565.84 :z 7546899.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10763449.0 :y 175882.66 :z 7507808.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x6f #x118c -832 #x7ebd))
@@ -13344,7 +13344,7 @@
                    (new 'static 'continue-point
                      :name "desert-db-start"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 10381380.0 :y 46965.555 :z 6078700.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 10389444.0 :y 69219.53 :z 6128357.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -75 -32678 6 #x937))
@@ -13364,7 +13364,7 @@
                    (new 'static 'continue-point
                      :name "desert-tunnelc-exit"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 6866113.0 :y 91338.75 :z 8000343.5 :w 1.0)
                      :camera-trans (new 'static 'vector :x 6914560.0 :y 112599.86 :z 8000513.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1127 #x5a8e -1268 -23090))
@@ -13384,7 +13384,7 @@
                    (new 'static 'continue-point
                      :name "desert-tunnelf-exit"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 7974519.0 :y 91203.586 :z 9258848.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 7975734.5 :y 113736.086 :z 9210673.0 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x54c #xfc #xe5 #x7fde))
@@ -13404,7 +13404,7 @@
                    (new 'static 'continue-point
                      :name "desert-tunneld-exit"
                      :level 'desert
-                     :flags (continue-flags no-auto record-path)
+                     :flags (continue-flags no-auto race)
                      :trans (new 'static 'vector :x 8464295.0 :y 94717.54 :z 7299125.0 :w 1.0)
                      :camera-trans (new 'static 'vector :x 8425602.0 :y 117229.57 :z 7291359.5 :w 1.0)
                      :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1779 -20715 #x4e0 -25292))
@@ -13597,7 +13597,7 @@
                   :continues '((new 'static 'continue-point
                       :name "desertb-start"
                       :level 'desertb
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 11644513.0 :y 120889.34 :z 2970391.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 11695685.0 :y 142048.05 :z 2971192.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -28445 49 #x3f82))
@@ -13617,7 +13617,7 @@
                     (new 'static 'continue-point
                       :name "desertb-race-start"
                       :level 'desertb
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 11483517.0 :y 92969.78 :z 999301.1 :w 1.0)
                       :camera-trans (new 'static 'vector :x 11442637.0 :y 118434.2 :z 996084.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -271 #x5709 #x130 #x5dd2))
@@ -13637,7 +13637,7 @@
                     (new 'static 'continue-point
                       :name "desertb-race-pre-start"
                       :level 'desertb
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 11371971.0 :y 94167.04 :z 962314.25 :w 1.0)
                       :camera-trans (new 'static 'vector :x 11116160.0 :y 122627.69 :z 970056.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x1b7 #x5bee -377 #x5907))
@@ -13657,7 +13657,7 @@
                     (new 'static 'continue-point
                       :name "desertb-race-test-start"
                       :level 'desertb
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 10895748.0 :y 115178.29 :z 1023596.94 :w 1.0)
                       :camera-trans (new 'static 'vector :x 10853512.0 :y 132208.23 :z 1027103.94 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -317 #x5e31 #x1d7 #x56a0))
@@ -13677,7 +13677,7 @@
                     (new 'static 'continue-point
                       :name "desertb-race-record"
                       :level 'desertb
-                      :flags (continue-flags change-continue no-auto test)
+                      :flags (continue-flags change-continue no-auto nothing-apparently)
                       :trans (new 'static 'vector :x 11494007.0 :y 108865.945 :z 2089361.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 11492998.0 :y 129969.766 :z 2140546.2 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -3 #x7ffb -3 -452))
@@ -13697,7 +13697,7 @@
                     (new 'static 'continue-point
                       :name "desertb-time-trial-start"
                       :level 'desertb
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 11625416.0 :y 90477.77 :z 988189.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x 11575767.0 :y 111571.766 :z 975643.9 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x5029 0 #x63c5))
@@ -13717,7 +13717,7 @@
                     (new 'static 'continue-point
                       :name "desertb-final-boss-start"
                       :level 'desertb
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 9266747.0 :y 123430.09 :z 1080473.6 :w 1.0)
                       :camera-trans (new 'static 'vector :x 9254848.0 :y 142267.19 :z 1121516.8 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x989 -45 #x7fa3))
@@ -13757,7 +13757,7 @@
                     (new 'static 'continue-point
                       :name "desert-final-boss-res-movie"
                       :level 'desertb
-                      :flags (continue-flags scene-wait no-auto cf26)
+                      :flags (continue-flags scene-wait no-auto vehicle-movie)
                       :trans (new 'static 'vector :x 10677958.0 :y 114784.664 :z 523338.12 :w 1.0)
                       :camera-trans (new 'static 'vector :x 10711110.0 :y 135851.22 :z 484332.34 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -9718 -3 #x7a39))
@@ -14001,7 +14001,7 @@
                   :continues '((new 'static 'continue-point
                       :name "desertf-start"
                       :level 'desertf
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 7601819.5 :y 365067.47 :z 14977268.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 7623822.0 :y 386166.38 :z 15023483.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x737a 0 -14132))
@@ -14021,7 +14021,7 @@
                     (new 'static 'continue-point
                       :name "desertf-toad"
                       :level 'desertf
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 5863030.5 :y 109921.08 :z 12575995.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 5834114.5 :y 140238.03 :z 12607111.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x1e1 -30499 #x401 -11920))
@@ -14061,7 +14061,7 @@
                     (new 'static 'continue-point
                       :name "desertf-toad-chase"
                       :level 'desertf
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 6245907.5 :y 99122.79 :z 12166345.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 6284458.5 :y 120240.54 :z 12132636.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 9 #x372d 6 -29562))
@@ -14151,7 +14151,7 @@
                     (new 'static 'continue-point
                       :name "desert-hunt-intro"
                       :level 'desertg
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 9336744.0 :y 71967.945 :z 9525611.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 9363271.0 :y 93074.23 :z 9569379.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -30502 0 #x2eb7))
@@ -14171,7 +14171,7 @@
                     (new 'static 'continue-point
                       :name "desertg-hunt-res-start"
                       :level 'desertg
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 8495919.0 :y -92073.58 :z 8076573.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x 8482173.0 :y -63350.785 :z 8013929.5 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x418 -8165 #x2a6 -31705))
@@ -14191,7 +14191,7 @@
                     (new 'static 'continue-point
                       :name "desertg-hunt-res-end"
                       :level 'desertg
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 13162254.0 :y 145119.64 :z 7645461.5 :w 1.0)
                       :camera-trans (new 'static 'vector :x 13176389.0 :y 171981.2 :z 7700640.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x53f -32468 -95 #x1065))
@@ -14211,7 +14211,7 @@
                     (new 'static 'continue-point
                       :name "desert-nest-entrance"
                       :level 'desertg
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 9223748.0 :y 72089.6 :z 9187663.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 9282260.0 :y 112844.39 :z 9228508.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x7c #x70ee #xeb -15413))
@@ -14231,7 +14231,7 @@
                     (new 'static 'continue-point
                       :name "desert-nest-exit"
                       :level 'desertg
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 8965557.0 :y 71516.16 :z 9015010.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 8919879.0 :y 96012.695 :z 8969672.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #xa99 -16498 -979 -28159))
@@ -14312,7 +14312,7 @@
                   :continues '((new 'static 'continue-point
                       :name "deserth-start"
                       :level 'deserth
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 11399696.0 :y 172503.45 :z 13225533.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 11424688.0 :y 194233.55 :z 13180632.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -9836 0 #x7a15))
@@ -14598,7 +14598,7 @@
                    :continues '((new 'static 'continue-point
                        :name "desrally-race-start"
                        :level 'desrally
-                       :flags (continue-flags change-continue no-auto record-path)
+                       :flags (continue-flags change-continue no-auto race)
                        :trans (new 'static 'vector :x 6289535.0 :y 92411.49 :z 8031117.5 :w 1.0)
                        :camera-trans (new 'static 'vector :x 6245386.0 :y 113111.45 :z 8030402.0 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x20c #x59c6 -606 #x5b28))
@@ -14618,7 +14618,7 @@
                      (new 'static 'continue-point
                        :name "desrally-record"
                        :level 'desrally
-                       :flags (continue-flags change-continue no-auto record-path)
+                       :flags (continue-flags change-continue no-auto race)
                        :trans (new 'static 'vector :x 5866029.5 :y 208657.2 :z 6777238.0 :w 1.0)
                        :camera-trans (new 'static 'vector :x 5871616.0 :y 229362.89 :z 6740352.0 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #xb60 -2480 #x3b6 #x7f0f))
@@ -14669,7 +14669,7 @@
                    :continues '((new 'static 'continue-point
                        :name "desert-hover-movie"
                        :level 'deshover
-                       :flags (continue-flags change-continue no-auto record-path)
+                       :flags (continue-flags change-continue no-auto race)
                        :trans (new 'static 'vector :x 5522368.0 :y 171279.56 :z 2212401.2 :w 1.0)
                        :camera-trans (new 'static 'vector :x 5572332.0 :y 192369.05 :z 2223532.8 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x6d6f 0 -16986))
@@ -15793,7 +15793,7 @@
                :continues '((new 'static 'continue-point
                    :name "nsta-start"
                    :level 'nsta
-                   :flags (continue-flags record-path)
+                   :flags (continue-flags race)
                    :trans (new 'static 'vector :x 7843291.0 :y -134689.17 :z 7799232.0 :w 1.0)
                    :camera-trans (new 'static 'vector :x 7886400.0 :y -115394.15 :z 7810056.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -26288 0 #x4c63))
@@ -15813,7 +15813,7 @@
                  (new 'static 'continue-point
                    :name "nsta-eggs"
                    :level 'nsta
-                   :flags (continue-flags no-auto record-path)
+                   :flags (continue-flags no-auto race)
                    :trans (new 'static 'vector :x 7843291.0 :y -134689.17 :z 7799232.0 :w 1.0)
                    :camera-trans (new 'static 'vector :x 7886400.0 :y -115394.15 :z 7810056.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -26288 0 #x4c63))
@@ -15833,7 +15833,7 @@
                  (new 'static 'continue-point
                    :name "nsta-cave"
                    :level 'nsta
-                   :flags (continue-flags no-auto record-path)
+                   :flags (continue-flags no-auto race)
                    :trans (new 'static 'vector :x 6744972.5 :y -392779.78 :z 2620850.2 :w 1.0)
                    :camera-trans (new 'static 'vector :x 6772533.0 :y -371657.94 :z 2664031.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7a77 0 -9518))
@@ -15853,7 +15853,7 @@
                  (new 'static 'continue-point
                    :name "nsta-fma"
                    :level 'nsta
-                   :flags (continue-flags no-auto record-path)
+                   :flags (continue-flags no-auto race)
                    :trans (new 'static 'vector :x 6782070.0 :y -341917.7 :z 3113670.2 :w 1.0)
                    :camera-trans (new 'static 'vector :x 6832845.5 :y -313126.1 :z 3071681.2 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x2c7 -13562 #xe8 #x7476))
@@ -15903,7 +15903,7 @@
                :continues '((new 'static 'continue-point
                    :name "nstb-start"
                    :level 'nstb
-                   :flags (continue-flags no-auto record-path)
+                   :flags (continue-flags no-auto race)
                    :trans (new 'static 'vector :x 6744972.5 :y -392779.78 :z 2620850.2 :w 1.0)
                    :camera-trans (new 'static 'vector :x 6772533.0 :y -371657.94 :z 2664031.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7a77 0 -9518))
@@ -15923,7 +15923,7 @@
                  (new 'static 'continue-point
                    :name "nstb-hunt"
                    :level 'nstb
-                   :flags (continue-flags no-auto record-path)
+                   :flags (continue-flags no-auto race)
                    :trans (new 'static 'vector :x 6744972.5 :y -392779.78 :z 2620850.2 :w 1.0)
                    :camera-trans (new 'static 'vector :x 6772533.0 :y -371657.94 :z 2664031.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7a77 0 -9518))
@@ -15943,7 +15943,7 @@
                  (new 'static 'continue-point
                    :name "nstb-crystal"
                    :level 'nstb
-                   :flags (continue-flags no-auto copy-entity-pos record-path)
+                   :flags (continue-flags no-auto copy-entity-pos race)
                    :trans (new 'static 'vector :x 6744972.5 :y -392779.78 :z 2620850.2 :w 1.0)
                    :camera-trans (new 'static 'vector :x 6772533.0 :y -371657.94 :z 2664031.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7a77 0 -9518))
@@ -15963,7 +15963,7 @@
                  (new 'static 'continue-point
                    :name "nstb-race"
                    :level 'nstb
-                   :flags (continue-flags no-auto record-path)
+                   :flags (continue-flags no-auto race)
                    :trans (new 'static 'vector :x 6744972.5 :y -392779.78 :z 2620850.2 :w 1.0)
                    :camera-trans (new 'static 'vector :x 6772533.0 :y -371657.94 :z 2664031.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7a77 0 -9518))
@@ -15983,7 +15983,7 @@
                  (new 'static 'continue-point
                    :name "nstb-escape"
                    :level 'nstb
-                   :flags (continue-flags no-auto record-path)
+                   :flags (continue-flags no-auto race)
                    :trans (new 'static 'vector :x 6617243.5 :y -371388.0 :z 2441774.0 :w 1.0)
                    :camera-trans (new 'static 'vector :x 6577418.0 :y -343491.78 :z 2384969.0 :w 1.0)
                    :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -176 -9148 #x137 -31459))
@@ -16172,7 +16172,7 @@
                     (new 'static 'continue-point
                       :name "templex-ravine"
                       :level 'templex
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 17738900.0 :y 217505.8 :z 16952992.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 17753552.0 :y 238593.23 :z 16903936.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 #x810 -1104 #xd5c -32501))
@@ -16212,7 +16212,7 @@
                     (new 'static 'continue-point
                       :name "templex-top"
                       :level 'templex
-                      :flags (continue-flags no-auto record-path)
+                      :flags (continue-flags no-auto race)
                       :trans (new 'static 'vector :x 17308740.0 :y 1084131.8 :z 16235471.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 17349566.0 :y 1105249.1 :z 16266326.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7421 0 -13775))
@@ -16615,7 +16615,7 @@
                     (new 'static 'continue-point
                       :name "templeb-glide"
                       :level 'templeb
-                      :flags (continue-flags no-auto cf31)
+                      :flags (continue-flags no-auto lightjak)
                       :trans (new 'static 'vector :x 17238664.0 :y 189938.89 :z 19509640.0 :w 1.0)
                       :camera-trans (new 'static 'vector :x 17262852.0 :y 210861.27 :z 19553988.0 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -28612 0 #x3e58))
@@ -17219,7 +17219,7 @@
                 :continues '((new 'static 'continue-point
                     :name "hanga-start"
                     :level 'hanga
-                    :flags (continue-flags no-auto record-path)
+                    :flags (continue-flags no-auto race)
                     :trans (new 'static 'vector :x 16819094.0 :y 1174688.1 :z 16639186.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x 16867160.0 :y 1199323.1 :z 16688642.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -445 #x7682 -1137 -12313))
@@ -17239,7 +17239,7 @@
                   (new 'static 'continue-point
                     :name "hanga-halfway"
                     :level 'hanga
-                    :flags (continue-flags no-auto record-path)
+                    :flags (continue-flags no-auto race)
                     :trans (new 'static 'vector :x 5954590.5 :y 1131934.9 :z 9072372.0 :w 1.0)
                     :camera-trans (new 'static 'vector :x 5977600.0 :y 1156697.2 :z 9117896.0 :w 1.0)
                     :quat (new 'static 'vector4h :data (new 'static 'array int16 4 -1058 #x7bb8 -2962 -7778))
@@ -17448,7 +17448,7 @@
       (new 'static 'continue-point
         :name "volcano-flut-1"
         :level 'volcanoa
-        :flags (continue-flags no-auto cf28)
+        :flags (continue-flags no-auto flut-fight)
         :trans (new 'static 'vector :x -8789.606 :y 81750.42 :z -1259742.9 :w 1.0)
         :camera-trans (new 'static 'vector :x -59694.695 :y 102857.12 :z -1265227.4 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x56db 0 #x5e00))
@@ -17466,7 +17466,7 @@
       (new 'static 'continue-point
         :name "volcano-flut-2"
         :level 'volcanoa
-        :flags (continue-flags no-auto cf28)
+        :flags (continue-flags no-auto flut-fight)
         :trans (new 'static 'vector :x -151263.64 :y 49150.363 :z -1020328.4 :w 1.0)
         :camera-trans (new 'static 'vector :x -109073.2 :y 90724.35 :z -991319.6 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x6e8c 0 -16511))
@@ -17484,7 +17484,7 @@
       (new 'static 'continue-point
         :name "volcano-indax-1"
         :level 'volcanoa
-        :flags (continue-flags no-auto pilot-dax cf27)
+        :flags (continue-flags no-auto indax indax-hang)
         :trans (new 'static 'vector :x 98610.38 :y 113585.36 :z 52110.95 :w 1.0)
         :camera-trans (new 'static 'vector :x 114574.13 :y 117680.945 :z 48513.434 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -23674 0 #x587b))
@@ -17533,7 +17533,7 @@
       (new 'static 'continue-point
         :name "volcano-post-rock-collapse"
         :level 'volcanoa
-        :flags (continue-flags no-auto pilot-dax)
+        :flags (continue-flags no-auto indax)
         :trans (new 'static 'vector :x 308310.03 :y 75210.75 :z 362059.38 :w 1.0)
         :camera-trans (new 'static 'vector :x 312644.8 :y 93494.88 :z 402524.16 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -31790 0 #x1ef6))
@@ -17605,7 +17605,7 @@
       (new 'static 'continue-point
         :name "volcano-indax-2"
         :level 'volcanoa
-        :flags (continue-flags no-auto pilot-dax)
+        :flags (continue-flags no-auto indax)
         :trans (new 'static 'vector :x -355248.94 :y 51808.664 :z 562249.75 :w 1.0)
         :camera-trans (new 'static 'vector :x -331340.6 :y 73882.83 :z 515073.22 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -8093 0 #x7c03))
@@ -17641,7 +17641,7 @@
       (new 'static 'continue-point
         :name "volcano-post-rock-fall"
         :level 'volcanoa
-        :flags (continue-flags no-auto pilot-dax)
+        :flags (continue-flags no-auto indax)
         :trans (new 'static 'vector :x -310118.4 :y 24563.303 :z 435816.03 :w 1.0)
         :camera-trans (new 'static 'vector :x -283636.53 :y 44336.742 :z 473550.44 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -17029 0 -27992))
@@ -18071,7 +18071,7 @@
                    :continues '((new 'static 'continue-point
                        :name "factoryb-start"
                        :level 'factoryb
-                       :flags (continue-flags record-path)
+                       :flags (continue-flags race)
                        :trans (new 'static 'vector :x 2412732.8 :y 1672502.9 :z 1152467.0 :w 1.0)
                        :camera-trans (new 'static 'vector :x 2467814.5 :y 1699122.8 :z 1153842.0 :w 1.0)
                        :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -23457 0 #x595a))
@@ -18159,7 +18159,7 @@
       (new 'static 'continue-point
         :name "factory-indax-1"
         :level 'factoryc
-        :flags (continue-flags no-auto pilot-dax cf27)
+        :flags (continue-flags no-auto indax indax-hang)
         :trans (new 'static 'vector :x 1049604.9 :y 1803550.8 :z 163024.89 :w 1.0)
         :camera-trans (new 'static 'vector :x 1049816.6 :y 1807641.0 :z 177547.27 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7fe8 0 #x4c6))
@@ -18214,7 +18214,7 @@
       (new 'static 'continue-point
         :name "factory-indax-2"
         :level 'factoryc
-        :flags (continue-flags no-auto pilot-dax cf27)
+        :flags (continue-flags no-auto indax indax-hang)
         :trans (new 'static 'vector :x 1145705.2 :y 1860880.4 :z -784490.9 :w 1.0)
         :camera-trans (new 'static 'vector :x 1125859.8 :y 1865584.2 :z -784731.75 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 -25725 0 -20289))
@@ -18251,7 +18251,7 @@
       (new 'static 'continue-point
         :name "factory-mid-indax-2"
         :level 'factoryc
-        :flags (continue-flags no-auto pilot-dax)
+        :flags (continue-flags no-auto indax)
         :trans (new 'static 'vector :x 986074.75 :y 1794785.8 :z -887165.75 :w 1.0)
         :camera-trans (new 'static 'vector :x 1006656.7 :y 1807682.4 :z -883927.9 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x4e5f 0 #x652e))
@@ -18313,7 +18313,7 @@
       (new 'static 'continue-point
         :name "factory-indax-3"
         :level 'factoryc
-        :flags (continue-flags no-auto pilot-dax cf27)
+        :flags (continue-flags no-auto indax indax-hang)
         :trans (new 'static 'vector :x 99605.71 :y 1934690.2 :z -533456.06 :w 1.0)
         :camera-trans (new 'static 'vector :x 100997.94 :y 1938784.6 :z -549898.25 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x49b 0 #x7fe8))
@@ -18368,7 +18368,7 @@
       (new 'static 'continue-point
         :name "factory-indax-4"
         :level 'factoryc
-        :flags (continue-flags no-auto pilot-dax cf27)
+        :flags (continue-flags no-auto indax indax-hang)
         :trans (new 'static 'vector :x 403773.84 :y 1836318.8 :z 118652.516 :w 1.0)
         :camera-trans (new 'static 'vector :x 413420.75 :y 1840411.9 :z 105407.695 :w 1.0)
         :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x1bda 0 -31980))
@@ -18658,7 +18658,7 @@
                   :continues '((new 'static 'continue-point
                       :name "precura-mech"
                       :level 'precura
-                      :flags (continue-flags scene-wait no-auto record-sig)
+                      :flags (continue-flags scene-wait no-auto mech)
                       :trans (new 'static 'vector :x 35848.6 :y 2258200.5 :z -445852.06 :w 1.0)
                       :camera-trans (new 'static 'vector :x 33189.477 :y 2277744.8 :z -400387.7 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7fca 0 #x72a))
@@ -18676,7 +18676,7 @@
                     (new 'static 'continue-point
                       :name "precura-mech-end"
                       :level 'precura
-                      :flags (continue-flags no-auto record-sig)
+                      :flags (continue-flags no-auto mech)
                       :trans (new 'static 'vector :x -844862.25 :y 2187819.5 :z -296978.44 :w 1.0)
                       :camera-trans (new 'static 'vector :x -823754.75 :y 2221199.8 :z -277565.44 :w 1.0)
                       :quat (new 'static 'vector4h :data (new 'static 'array int16 4 0 #x7765 0 -11805))
diff --git a/test/decompiler/reference/jak3/engine/target/target-darkjak_REF.gc b/test/decompiler/reference/jak3/engine/target/target-darkjak_REF.gc
index c5c502b4cfb..124c47a7800 100644
--- a/test/decompiler/reference/jak3/engine/target/target-darkjak_REF.gc
+++ b/test/decompiler/reference/jak3/engine/target/target-darkjak_REF.gc
@@ -860,7 +860,7 @@
                                                )
                         )
                    )
-              (or (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
+              (or (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
                   (not (-> *setting-control* user-current darkjak))
                   (not (logtest? (the-as game-feature (logand (game-feature darkjak) (-> *setting-control* user-current features)))
                                  (-> self game features)
@@ -1048,21 +1048,21 @@
     (target-lightjak-end-mode #t)
     (set! (-> self darkjak latch-out-time) 0)
     (set! (-> self lightjak get-off-lock) #f)
-    (set! (-> self darkjak stage) (logior arg0 (darkjak-stage bomb0)))
+    (set! (-> self darkjak stage) (logior arg0 (darkjak-stage active)))
     (if (logtest? (game-feature darkjak-bomb0) (-> self game features))
-        (logior! (-> self darkjak stage) (darkjak-stage invinc))
+        (logior! (-> self darkjak stage) (darkjak-stage bomb0))
         )
     (if (logtest? (game-feature darkjak-bomb1) (-> self game features))
-        (logior! (-> self darkjak stage) (darkjak-stage giant))
+        (logior! (-> self darkjak stage) (darkjak-stage bomb1))
         )
-    (if (logtest? (game-feature feature45) (-> self game features))
-        (logior! (-> self darkjak stage) (darkjak-stage disable-force-on))
+    (if (logtest? (game-feature darkjak-invinc) (-> self game features))
+        (logior! (-> self darkjak stage) (darkjak-stage invinc))
         )
-    (if (logtest? (game-feature feature44) (-> self game features))
-        (logior! (-> self darkjak stage) (darkjak-stage no-anim))
+    (if (logtest? (game-feature darkjak-tracking) (-> self game features))
+        (logior! (-> self darkjak stage) (darkjak-stage tracking))
         )
     (if (logtest? (game-feature darkjak-smack) (-> self game features))
-        (logior! (-> self darkjak stage) (darkjak-stage bomb1))
+        (logior! (-> self darkjak stage) (darkjak-stage smack))
         )
     (set! (-> self darkjak want-stage) (-> self darkjak stage))
     (set! (-> self neck flex-blend) 0.0)
@@ -1077,20 +1077,20 @@
     (set! (-> self darkjak mode-sound-bank) (add-setting! 'mode-sound-bank 'modedark 0.0 0))
     (set! (-> self darkjak lightning-count) 0)
     (cond
-      ((logtest? (-> self darkjak stage) (darkjak-stage ds8))
+      ((logtest? (-> self darkjak stage) (darkjak-stage invis))
        (logclear! (-> self target-flags) (target-flags tf4))
-       (logclear! (-> self darkjak stage) (darkjak-stage bomb1 invinc giant no-anim disable-force-on))
+       (logclear! (-> self darkjak stage) (darkjak-stage smack bomb0 bomb1 tracking invinc))
        (target-invisible-start (-> *TARGET-bank* invisible-duration))
        (set! (-> self fact darkjak-effect-time) (-> *TARGET-bank* invisible-duration))
        )
-      ((logtest? (-> self darkjak stage) (darkjak-stage disable-force-on))
+      ((logtest? (-> self darkjak stage) (darkjak-stage invinc))
        (logior! (-> self target-flags) (target-flags tf4))
        )
       (else
         (logclear! (-> self target-flags) (target-flags tf4))
         )
       )
-    (if (logtest? arg0 (darkjak-stage ds9))
+    (if (logtest? arg0 (darkjak-stage no-anim))
         (go target-stance)
         )
     (target-start-attack)
@@ -1323,7 +1323,7 @@
          )
        (target-start-attack)
        (target-danger-set! 'punch #f)
-       (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
+       (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
            (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-punch-inc)))
            )
        (let ((a0-11 (-> self control impact-ctrl))
@@ -1358,7 +1358,7 @@
                (not (logtest? (-> self control current-surface flags) (surface-flag no-attack)))
                (and (focus-test? self dark)
                     (nonzero? (-> self darkjak))
-                    (logtest? (-> self darkjak stage) (darkjak-stage bomb0))
+                    (logtest? (-> self darkjak stage) (darkjak-stage active))
                     )
                (< sv-32 2)
                )
@@ -1377,7 +1377,7 @@
              ((arg0 (pointer float)) (arg1 (pointer int64)) (arg2 (pointer int64)))
              (let ((s3-0 (if (and (focus-test? self dark)
                                   (nonzero? (-> self darkjak))
-                                  (logtest? (-> self darkjak stage) (darkjak-stage no-anim))
+                                  (logtest? (-> self darkjak stage) (darkjak-stage tracking))
                                   )
                              (combo-tracker-method-13
                                (-> self control unknown-combo-tracker00)
@@ -1403,7 +1403,7 @@
                      )
                  (target-start-attack)
                  (target-danger-set! 'punch #f)
-                 (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
+                 (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
                      (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-punch-inc)))
                      )
                  (let ((v1-34 (ja-group)))
@@ -1777,7 +1777,7 @@
   :code (behavior ()
     (target-start-attack)
     (target-danger-set! 'dark-smack #f)
-    (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
+    (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
         (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-smack-inc)))
         )
     (set! (-> self control lightjak-sound-id) (sound-play "djak-pnch-swing"))
diff --git a/test/decompiler/reference/jak3/engine/target/target-death_REF.gc b/test/decompiler/reference/jak3/engine/target/target-death_REF.gc
index 97cc55a382a..2fb75662414 100644
--- a/test/decompiler/reference/jak3/engine/target/target-death_REF.gc
+++ b/test/decompiler/reference/jak3/engine/target/target-death_REF.gc
@@ -16,7 +16,7 @@
              (a3-0 (car a2-2))
              )
         (while (not (null? a2-2))
-          (if (and v1-0 (logtest? (continue-flags continue-flag-16) (-> (the-as continue-point a3-0) flags)))
+          (if (and v1-0 (logtest? (continue-flags test) (-> (the-as continue-point a3-0) flags)))
               (return (the-as continue-point a3-0))
               )
           (if (= a3-0 arg0)
@@ -71,23 +71,23 @@
          )
        )
      )
-    ((logtest? (continue-flags pilot-dax) (-> arg0 flags))
-     (go target-indax-start (the-as handle #f) (if (logtest? (continue-flags cf27) (-> arg0 flags))
+    ((logtest? (continue-flags indax) (-> arg0 flags))
+     (go target-indax-start (the-as handle #f) (if (logtest? (continue-flags indax-hang) (-> arg0 flags))
                                                    'hang
                                                    #t
                                                    )
          )
      )
-    ((logtest? (continue-flags cf23) (-> arg0 flags))
+    ((logtest? (continue-flags flut) (-> arg0 flags))
      (go target-flut-start (the-as handle #f) 'normal -1)
      )
-    ((logtest? (continue-flags cf24) (-> arg0 flags))
+    ((logtest? (continue-flags flut-racer) (-> arg0 flags))
      (go target-flut-start (the-as handle #f) 'racer -1)
      )
-    ((logtest? (continue-flags cf28) (-> arg0 flags))
+    ((logtest? (continue-flags flut-fight) (-> arg0 flags))
      (go target-flut-start (the-as handle #f) 'fight -1)
      )
-    ((logtest? (continue-flags cf31) (-> arg0 flags))
+    ((logtest? (continue-flags lightjak) (-> arg0 flags))
      (send-event self 'get-pickup (pickup-type eco-pill-light) 100.0)
      (case (-> arg0 vehicle-type)
        ((38)
@@ -98,11 +98,11 @@
          )
        )
      )
-    ((logtest? (-> arg0 flags) (continue-flags demo-movie))
+    ((logtest? (-> arg0 flags) (continue-flags darkjak))
      (send-event self 'get-pickup (pickup-type eco-pill-dark) 100.0)
-     (go target-darkjak-get-on (darkjak-stage force-on bomb0 ds9))
+     (go target-darkjak-get-on (darkjak-stage force-on active no-anim))
      )
-    ((logtest? (continue-flags cf25) (-> arg0 flags))
+    ((logtest? (continue-flags vehicle) (-> arg0 flags))
      (label cfg-39)
      (let* ((v1-77 (-> arg0 vehicle-type))
             (s5-2
@@ -134,7 +134,7 @@
        (send-event (handle->process s5-2) 'pickup)
        )
      )
-    ((logtest? (continue-flags cf30) (-> arg0 flags))
+    ((logtest? (continue-flags vehicle-scorpion) (-> arg0 flags))
      (label cfg-84)
      (let ((gp-1 (process->handle
                    (search-process-tree *active-pool* (lambda ((arg0 process)) (type? arg0 scorpion-gun-manager)))
@@ -153,7 +153,7 @@
          )
        )
      )
-    ((logtest? (continue-flags cf29) (-> arg0 flags))
+    ((logtest? (continue-flags htorpedo) (-> arg0 flags))
      (label cfg-114)
      (let ((gp-2 (process->handle (search-process-tree *active-pool* (lambda ((arg0 process)) (type? arg0 htorpedo))))))
        (when (not (handle->process gp-2))
@@ -165,12 +165,12 @@
        (send-event self 'change-mode 'pilot-daxter (handle->process gp-2))
        )
      )
-    ((logtest? (continue-flags record-sig) (-> arg0 flags))
+    ((logtest? (continue-flags mech) (-> arg0 flags))
      (go target-mech-start (the-as handle #f) 100.0 #t)
      )
-    ((logtest? (continue-flags test) (-> arg0 flags))
+    ((logtest? (continue-flags nothing-apparently) (-> arg0 flags))
      )
-    ((logtest? (continue-flags pilot) (-> arg0 flags))
+    ((logtest? (continue-flags credits) (-> arg0 flags))
      (case (-> arg0 vehicle-type)
        ((41)
         (go target-credits 1)
@@ -186,7 +186,7 @@
          )
        )
      )
-    ((and (logtest? (continue-flags record-path) (-> arg0 flags)) (!= (-> arg0 vehicle-type) 27))
+    ((and (logtest? (continue-flags race) (-> arg0 flags)) (!= (-> arg0 vehicle-type) 27))
      (set! (-> self mode-cache) (the-as basic 'pilot))
      (set! (-> self mode-param1) (the-as handle #f))
      (set! (-> self mode-param2) (-> arg0 vehicle-type))
@@ -215,7 +215,7 @@
        )
      (set! (-> self mode-param3) (the-as uint #t))
      )
-    ((logtest? (-> arg0 flags) (continue-flags demo-end))
+    ((logtest? (-> arg0 flags) (continue-flags grab))
      (go target-grab 'stance)
      )
     (else
@@ -577,7 +577,7 @@
     (kill-persister *setting-control* (the-as engine-pers 'fail-dialog-volume) 'dialog-volume)
     (kill-persister *setting-control* (the-as engine-pers 'fail-music-volume) 'music-volume)
     (when (-> *setting-control* user-current render)
-      (when (not (logtest? (continue-flags no-blackout cf26) (-> arg0 flags)))
+      (when (not (logtest? (continue-flags no-blackout vehicle-movie) (-> arg0 flags)))
         (add-setting! 'bg-a 'abs 1.0 0)
         (set! (-> *setting-control* user-current bg-a) 1.0)
         )
@@ -595,7 +595,7 @@
     (set-setting! 'allow-progress #f 0.0 0)
     (set-setting! 'level-trans-time #f 0.0 0)
     (kill-persister *setting-control* (the-as engine-pers 'speech-control) 'speech-control)
-    (when (logtest? (continue-flags cf27) (-> arg0 flags))
+    (when (logtest? (continue-flags indax-hang) (-> arg0 flags))
       (set-setting! 'head-offset 'abs (meters 1) 0)
       (set-setting! 'foot-offset 'abs (meters -1) 0)
       (set-setting! 'target-height 'abs (meters 1.5) 0)
@@ -711,7 +711,7 @@
       (suspend)
       0
       )
-    (when (logtest? (continue-flags pilot-dax) (-> arg0 flags))
+    (when (logtest? (continue-flags indax) (-> arg0 flags))
       (while (!= (-> self ext-anim) (-> self pending-ext-anim))
         (suspend)
         )
@@ -773,7 +773,7 @@
     (set! *spawn-actors* #t)
     (set! *teleport* #t)
     (set! (-> *ACTOR-bank* birth-max) 1000)
-    (if (not (logtest? (continue-flags no-blackout cf26) (-> arg0 flags)))
+    (if (not (logtest? (continue-flags no-blackout vehicle-movie) (-> arg0 flags)))
         (set-blackout-frames (seconds 0.1))
         )
     (let* ((a0-128 *game-info*)
diff --git a/test/decompiler/reference/jak3/engine/target/target-handler_REF.gc b/test/decompiler/reference/jak3/engine/target/target-handler_REF.gc
index b93c11e4081..5c3851522f1 100644
--- a/test/decompiler/reference/jak3/engine/target/target-handler_REF.gc
+++ b/test/decompiler/reference/jak3/engine/target/target-handler_REF.gc
@@ -418,7 +418,7 @@
         (send-event self 'hit arg1 arg0 arg2 sv-128)
         (set! arg0 (and (and (focus-test? self dark)
                              (nonzero? (-> self darkjak))
-                             (logtest? (-> self darkjak stage) (darkjak-stage bomb0))
+                             (logtest? (-> self darkjak stage) (darkjak-stage active))
                              )
                         arg0
                         )
@@ -1052,7 +1052,7 @@
        ((and (and (focus-test? self dark) (nonzero? (-> self darkjak)))
              (or (and (focus-test? self dark)
                       (nonzero? (-> self darkjak))
-                      (logtest? (-> self darkjak stage) (darkjak-stage disable-force-on))
+                      (logtest? (-> self darkjak stage) (darkjak-stage invinc))
                       )
                  (logtest? (process-mask crate) (-> arg0 mask))
                  )
diff --git a/test/decompiler/reference/jak3/engine/target/target-lightjak_REF.gc b/test/decompiler/reference/jak3/engine/target/target-lightjak_REF.gc
index 446dc90c00f..4df19f6ed21 100644
--- a/test/decompiler/reference/jak3/engine/target/target-lightjak_REF.gc
+++ b/test/decompiler/reference/jak3/engine/target/target-lightjak_REF.gc
@@ -914,7 +914,7 @@
                  (set! (-> self lightjak lightjak-before-powerjak) (the-as symbol (-> self control unknown-spool-anim00)))
                  (case (-> self lightjak get-on-latch)
                    ((512)
-                    (go target-darkjak-get-on (darkjak-stage bomb0))
+                    (go target-darkjak-get-on (darkjak-stage active))
                     )
                    ((8)
                     (if (and (focus-test? self light) (nonzero? (-> self lightjak)))
diff --git a/test/decompiler/reference/jak3/engine/target/target-util_REF.gc b/test/decompiler/reference/jak3/engine/target/target-util_REF.gc
index 278c9a64c1e..3ca742af098 100644
--- a/test/decompiler/reference/jak3/engine/target/target-util_REF.gc
+++ b/test/decompiler/reference/jak3/engine/target/target-util_REF.gc
@@ -767,7 +767,7 @@
        (set! (-> self control penetrate-using) (penetrate touch punch))
        (if (and (focus-test? self dark)
                 (nonzero? (-> self darkjak))
-                (logtest? (-> self darkjak stage) (darkjak-stage bomb0))
+                (logtest? (-> self darkjak stage) (darkjak-stage active))
                 )
            (logior! (-> self control penetrate-using) (penetrate dark-punch))
            )
diff --git a/test/decompiler/reference/jak3/engine/target/target_REF.gc b/test/decompiler/reference/jak3/engine/target/target_REF.gc
index a786cc8f1fe..290574cc728 100644
--- a/test/decompiler/reference/jak3/engine/target/target_REF.gc
+++ b/test/decompiler/reference/jak3/engine/target/target_REF.gc
@@ -114,7 +114,7 @@
                (>= (-> self game eco-pill-dark) (-> *FACT-bank* darkjak-button-invis-inc))
                )
       (target-invisible-start (seconds 30))
-      (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
+      (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
           (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-button-invis-inc)))
           )
       )
@@ -257,7 +257,7 @@
                (>= (-> self game eco-pill-dark) (-> *FACT-bank* darkjak-button-invis-inc))
                )
       (target-invisible-start (seconds 30))
-      (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
+      (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
           (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-button-invis-inc)))
           )
       )
@@ -2051,7 +2051,7 @@
                (>= (-> self game eco-pill-dark) (-> *FACT-bank* darkjak-button-invis-inc))
                )
       (target-invisible-start (seconds 30))
-      (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on active)))
+      (if (not (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark)))
           (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-button-invis-inc)))
           )
       )
@@ -2220,7 +2220,7 @@
     (target-start-attack)
     (target-danger-set! 'spin #f)
     (if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
-                 (logtest? (-> self darkjak stage) (darkjak-stage force-on active))
+                 (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
                  )
              )
         (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-spin-inc)))
@@ -2252,7 +2252,7 @@
     (let ((s5-0 jakb-attack-from-stance-ja)
           (gp-0 (if (and (focus-test? self dark)
                          (nonzero? (-> self darkjak))
-                         (logtest? (-> self darkjak stage) (darkjak-stage no-anim))
+                         (logtest? (-> self darkjak stage) (darkjak-stage tracking))
                          )
                     (combo-tracker-method-13
                       (-> self control unknown-combo-tracker00)
@@ -2744,7 +2744,7 @@
     (target-start-attack)
     (target-danger-set! 'punch #f)
     (if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
-                 (logtest? (-> self darkjak stage) (darkjak-stage force-on active))
+                 (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
                  )
              )
         (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-punch-inc)))
@@ -3003,7 +3003,7 @@
     (target-start-attack)
     (target-danger-set! 'spin-air #f)
     (if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
-                 (logtest? (-> self darkjak stage) (darkjak-stage force-on active))
+                 (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
                  )
              )
         (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-spin-inc)))
@@ -3201,7 +3201,7 @@
     (target-start-attack)
     (target-danger-set! 'uppercut #f)
     (if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
-                 (logtest? (-> self darkjak stage) (darkjak-stage force-on active))
+                 (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
                  )
              )
         (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-uppercut-inc)))
@@ -3286,7 +3286,7 @@
          )
         ((and (and (focus-test? self dark)
                    (nonzero? (-> self darkjak))
-                   (logtest? (-> self darkjak stage) (darkjak-stage giant))
+                   (logtest? (-> self darkjak stage) (darkjak-stage bomb1))
                    )
               (and (= (-> self ext-anim) (target-anim dark))
                    (logtest? (the-as game-feature (logand (game-feature darkjak-bomb1) (-> *setting-control* user-current features)))
@@ -3541,7 +3541,7 @@
        )
       ((and (and (focus-test? self dark)
                  (nonzero? (-> self darkjak))
-                 (logtest? (-> self darkjak stage) (darkjak-stage invinc))
+                 (logtest? (-> self darkjak stage) (darkjak-stage bomb0))
                  )
             (and (= (-> self ext-anim) (target-anim dark))
                  (logtest? (the-as game-feature (logand (game-feature darkjak-bomb0) (-> *setting-control* user-current features)))
@@ -3620,7 +3620,7 @@
         (when (or (and (= (-> self fact eco-type) 2) (>= (-> self fact eco-level) 1.0))
                   (and (focus-test? self dark)
                        (nonzero? (-> self darkjak))
-                       (logtest? (-> self darkjak stage) (darkjak-stage bomb0))
+                       (logtest? (-> self darkjak stage) (darkjak-stage active))
                        )
                   )
           (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.5))
@@ -3671,7 +3671,7 @@
       (target-start-attack)
       (target-danger-set! 'flop #f)
       (if (not (or (not (and (focus-test? self dark) (nonzero? (-> self darkjak))))
-                   (logtest? (-> self darkjak stage) (darkjak-stage force-on active))
+                   (logtest? (-> self darkjak stage) (darkjak-stage force-on endless-dark))
                    )
                )
           (send-event self 'get-pickup (pickup-type eco-pill-dark) (- (-> *FACT-bank* darkjak-flop-inc)))
diff --git a/test/decompiler/reference/jak3/levels/common/race/race-manager_REF.gc b/test/decompiler/reference/jak3/levels/common/race/race-manager_REF.gc
index c170ed1ac77..3658a4749d2 100644
--- a/test/decompiler/reference/jak3/levels/common/race/race-manager_REF.gc
+++ b/test/decompiler/reference/jak3/levels/common/race/race-manager_REF.gc
@@ -1053,7 +1053,7 @@
          (s5-0 (-> gp-0 info))
          )
     (if (or (logtest? (-> s5-0 flags) (racer-info-flag rif0))
-            (logtest? (continue-flags record-path) (-> *game-info* last-continue flags))
+            (logtest? (continue-flags race) (-> *game-info* last-continue flags))
             )
         (logior! (-> gp-0 flags) (race-flag rf2))
         )
diff --git a/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-rhino_REF.gc b/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-rhino_REF.gc
index fc21c4a3dc9..c778987e586 100644
--- a/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-rhino_REF.gc
+++ b/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-rhino_REF.gc
@@ -209,14 +209,14 @@
 (defmethod vehicle-method-79 ((this v-rhino))
   (set! (-> this turbo-supply) 3.0)
   (seek! (-> this gun-kick) 0.0 (* 32768.0 (seconds-per-frame)))
-  (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
+  (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
     (set! (-> this jmod-gun-kick transform trans z) (-> this gun-kick))
     (quaternion-axis-angle! (-> s5-0 1) 1.0 0.0 0.0 (- (-> this gun-pitch)))
     (quaternion-axis-angle! (-> s5-0 2) 0.0 1.0 0.0 (-> this gun-yaw))
     (quaternion*! (-> this jmod-gun-turn rotation) (-> s5-0 2) (-> s5-0 1))
     )
   0
-  (let ((s5-1 (new 'stack-no-clear 'inline-array 'quaternion 2)))
+  (let ((s5-1 (new 'stack-no-clear 'inline-array 'quaternion 3)))
     (set-vector! (-> s5-1 2) 0.0 0.0 0.0 0.0)
     (dotimes (s4-0 (-> this info physics-model wheel-count))
       (let ((v1-8 (-> this wheel s4-0)))
@@ -268,7 +268,3 @@
   0
   (none)
   )
-
-
-
-
diff --git a/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-scorpion_REF.gc b/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-scorpion_REF.gc
index 978ea5d8d1f..0a91086c6ad 100644
--- a/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-scorpion_REF.gc
+++ b/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-scorpion_REF.gc
@@ -241,7 +241,7 @@
   (quaternion-axis-angle! (-> this jmod-gun-tilt transform quat) 1.0 0.0 0.0 (-> this gun-pitch))
   (quaternion-axis-angle! (-> this jmod-gun-turn rotation) 0.0 1.0 0.0 (+ 32768.0 (-> this gun-yaw)))
   0
-  (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
+  (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
     (set-vector! (-> s5-0 2) -1638.4 -1638.4 1638.4 1638.4)
     (dotimes (s4-0 (-> this info physics-model wheel-count))
       (let ((v1-9 (-> this wheel s4-0)))
@@ -407,7 +407,3 @@
       )
     )
   )
-
-
-
-
diff --git a/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-turtle_REF.gc b/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-turtle_REF.gc
index 4fc6c471fd0..95196686620 100644
--- a/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-turtle_REF.gc
+++ b/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-turtle_REF.gc
@@ -140,7 +140,7 @@
          )
     (init-vf0-vector)
     (set-vector! (-> this root scale) 1.0 1.0 1.07 1.0)
-    (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
+    (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
       (set-vector! (-> s5-0 2) -3640.889 3640.889 3640.889 -3640.889)
       (dotimes (s4-0 (-> this info physics-model wheel-count))
         (let ((v1-6 (-> this wheel s4-0)))
diff --git a/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar_REF.gc b/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar_REF.gc
index 2c8312217aa..64f4df76588 100644
--- a/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar_REF.gc
+++ b/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar_REF.gc
@@ -4081,7 +4081,7 @@
 ;; INFO: Used lq/sq
 ;; WARN: Return type mismatch int vs none.
 (defmethod vehicle-method-79 ((this wcar-snake-base))
-  (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 2)))
+  (let ((s5-0 (new 'stack-no-clear 'inline-array 'quaternion 3)))
     (set-vector! (-> s5-0 2) 1092.2667 1092.2667 0.0 0.0)
     (dotimes (s4-0 (-> this info physics-model wheel-count))
       (let ((s3-0 (-> this wheel s4-0)))
diff --git a/test/decompiler/reference/jak3/levels/mhcity/destroy-dark-eco_REF.gc b/test/decompiler/reference/jak3/levels/mhcity/destroy-dark-eco_REF.gc
index 76071911239..895ff07d182 100644
--- a/test/decompiler/reference/jak3/levels/mhcity/destroy-dark-eco_REF.gc
+++ b/test/decompiler/reference/jak3/levels/mhcity/destroy-dark-eco_REF.gc
@@ -341,7 +341,7 @@
     (task-node-close! (game-task-node city-destroy-darkeco-dark-punch) 'event)
     (set-setting! 'airlock #f 0.0 0)
     (suspend)
-    (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0 ds9))
+    (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active no-anim))
     )
   )
 
@@ -1431,7 +1431,7 @@
              *target*
              (not (logtest? (focus-status dark) (-> *target* focus-status)))
              )
-        (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
+        (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
         )
     (let ((t9-3 (-> (find-parent-state) trans)))
       (if t9-3
@@ -1643,7 +1643,3 @@
   (process-drawable-from-entity! this arg0)
   (go (method-of-object this idle))
   )
-
-
-
-
diff --git a/test/decompiler/reference/jak3/levels/wascity/wasstadium/wasstadc-obs_REF.gc b/test/decompiler/reference/jak3/levels/wascity/wasstadium/wasstadc-obs_REF.gc
index 63d408f5f65..faae30451f1 100644
--- a/test/decompiler/reference/jak3/levels/wascity/wasstadium/wasstadc-obs_REF.gc
+++ b/test/decompiler/reference/jak3/levels/wascity/wasstadium/wasstadc-obs_REF.gc
@@ -2631,7 +2631,7 @@
       (persist-with-delay *setting-control* 'gun (seconds 0.1) 'gun #f 0.0 0)
       (persist-with-delay *setting-control* 'board (seconds 0.1) 'board #f 0.0 0)
       (when (and *target* (not (logtest? (focus-status dark) (-> *target* focus-status))))
-        (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
+        (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
         (send-event (ppointer->process *crowd-manager*) 'darkjak)
         )
       )
@@ -2687,7 +2687,7 @@
         (persist-with-delay *setting-control* 'gun (seconds 0.1) 'gun #f 0.0 0)
         (persist-with-delay *setting-control* 'board (seconds 0.1) 'board #f 0.0 0)
         (if (and *target* (not (logtest? (focus-status dark) (-> *target* focus-status))))
-            (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
+            (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
             )
         (suspend)
         )
@@ -2763,7 +2763,7 @@
         (persist-with-delay *setting-control* 'gun (seconds 0.1) 'gun #f 0.0 0)
         (persist-with-delay *setting-control* 'board (seconds 0.1) 'board #f 0.0 0)
         (if (and *target* (not (logtest? (focus-status dark) (-> *target* focus-status))))
-            (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on bomb0))
+            (send-event *target* 'change-mode 'darkjak #f (darkjak-stage force-on active))
             )
         )
       )