From 9d359ed84a097fc2b019cb7918d897cb2a90d5bd Mon Sep 17 00:00:00 2001
From: Hat Kid <6624576+Hat-Kid@users.noreply.github.com>
Date: Mon, 22 Apr 2024 19:53:04 +0200
Subject: [PATCH] jak3: fix type (#3478)

---
 decompiler/config/jak3/all-types.gc         | 12 ++++++------
 decompiler/config/jak3/ntsc_v1/inputs.jsonc |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/decompiler/config/jak3/all-types.gc b/decompiler/config/jak3/all-types.gc
index 6b60114583..caf1b19124 100644
--- a/decompiler/config/jak3/all-types.gc
+++ b/decompiler/config/jak3/all-types.gc
@@ -53942,6 +53942,12 @@
   :method-count-assert 37
   :size-assert         #xe5
   :flag-assert         #x25007000e5
+  (:state-methods
+    inactive ;; 28, old: (active () _type_ :state)
+    active ;; 29, old: (taunt () _type_ :state)
+    taunt ;; 30, old: (got-passed () _type_ :state)
+    got-passed ;; 31, old: (initialize-collision (_type_) none)
+    )
   (:methods
     (vehicle-rider-method-32 () none) ;; 32 ;; (vehicle-rider-method-32 (_type_ traffic-object-spawn-params) none)
     (vehicle-rider-method-33 () none) ;; 33 ;; (vehicle-rider-method-33 (_type_) none)
@@ -53949,12 +53955,6 @@
     (vehicle-rider-method-35 () none) ;; 35 ;; (vehicle-rider-method-35 (_type_) none)
     (vehicle-rider-method-36 () none) ;; 36
     )
-  (:state-methods
-    inactive ;; 28, old: (active () _type_ :state)
-    got-passed ;; 31, old: (initialize-collision (_type_) none)
-    taunt ;; 30, old: (got-passed () _type_ :state)
-    active ;; 29, old: (taunt () _type_ :state)
-    )
   )
 
 (deftype citizen-norm-rider (vehicle-rider)
diff --git a/decompiler/config/jak3/ntsc_v1/inputs.jsonc b/decompiler/config/jak3/ntsc_v1/inputs.jsonc
index 3b43ec0fd1..360e027ec3 100644
--- a/decompiler/config/jak3/ntsc_v1/inputs.jsonc
+++ b/decompiler/config/jak3/ntsc_v1/inputs.jsonc
@@ -55,12 +55,12 @@
     "DGO/DESLIZ.DGO",
     // "DGO/DESOASIS.DGO",
     "DGO/DESRACE1.DGO",
-    // "DGO/DESRACE2.DGO",
+    "DGO/DESRACE2.DGO",
     "DGO/DESRALLY.DGO",
-    // "DGO/DESRESC.DGO",
+    "DGO/DESRESC.DGO",
     // "DGO/DESRESCC.DGO",
     // "DGO/DESRESCG.DGO",
-    // "DGO/DESTRACK.DGO",
+    "DGO/DESTRACK.DGO",
     "DGO/DESW.DGO",
     "DGO/DST.DGO",
     // "DGO/OASISCST.DGO",
@@ -154,7 +154,7 @@
     "DGO/TOWB.DGO",
     "DGO/TOWERA.DGO",
     "DGO/TOWERC.DGO",
-    // "DGO/TOWERCST.DGO",
+    "DGO/TOWERCST.DGO",
     // stadium
     "DGO/STA.DGO",
     "DGO/STAA.DGO",