From bd14760ddaae527f62902af5aec5fe80e8ee6dd6 Mon Sep 17 00:00:00 2001 From: water Date: Fri, 12 Apr 2024 20:14:25 -0400 Subject: [PATCH] temp --- decompiler/config/jak3/all-types.gc | 4 ++-- decompiler/config/jak3/ntsc_v1/inputs.jsonc | 10 +++++----- goal_src/jak3/engine/level/level.gc | 8 ++++++++ goal_src/jak3/engine/physics/cloth.gc | 6 ++++++ goal_src/jak3/engine/ui/minimap.gc | 5 +++-- goal_src/jak3/game.gp | 10 +++++----- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/decompiler/config/jak3/all-types.gc b/decompiler/config/jak3/all-types.gc index f68b9da9a9..685207b317 100644 --- a/decompiler/config/jak3/all-types.gc +++ b/decompiler/config/jak3/all-types.gc @@ -10840,8 +10840,8 @@ :flag-assert #x1400001430 (:methods (new (symbol type int) _type_) ;; 0 - (add-setting (_type_ process symbol object object object) none) ;; 9 - (persist-with-delay (_type_ symbol time-frame symbol symbol float int) none) ;; 10 + (add-setting (_type_ process symbol object object object) connection) ;; 9 + (persist-with-delay (_type_ symbol time-frame symbol symbol float int) connection) ;; 10 (set-setting (_type_ process symbol object object object) none) ;; 11 (remove-setting (_type_ process symbol) none) ;; 12 (kill-persister (_type_ engine-pers object) none) ;; 13 diff --git a/decompiler/config/jak3/ntsc_v1/inputs.jsonc b/decompiler/config/jak3/ntsc_v1/inputs.jsonc index 10fa70a385..b8b5cee323 100644 --- a/decompiler/config/jak3/ntsc_v1/inputs.jsonc +++ b/decompiler/config/jak3/ntsc_v1/inputs.jsonc @@ -29,10 +29,10 @@ "DGO/WCASEEM.DGO", "DGO/WASCAST.DGO", // // arena - // "DGO/WASSTADA.DGO", - // "DGO/WASSTADB.DGO", - // "DGO/WASSTADC.DGO", - // "DGO/ARENACST.DGO", + "DGO/WASSTADA.DGO", + "DGO/WASSTADB.DGO", + "DGO/WASSTADC.DGO", + "DGO/ARENACST.DGO", // // desert // "DGO/DESA.DGO", // "DGO/DESB.DGO", @@ -50,7 +50,7 @@ // "DGO/DESH.DGO", // "DGO/DESHOVER.DGO", // "DGO/DESHUNT.DGO", - // "DGO/DESINTER.DGO", + "DGO/DESINTER.DGO", // "DGO/DESJUMP.DGO", // "DGO/DESLIZ.DGO", // "DGO/DESOASIS.DGO", diff --git a/goal_src/jak3/engine/level/level.gc b/goal_src/jak3/engine/level/level.gc index 9100b5d559..fcc913ac4d 100644 --- a/goal_src/jak3/engine/level/level.gc +++ b/goal_src/jak3/engine/level/level.gc @@ -2781,6 +2781,14 @@ (defconstant *default-boot-level* 'halfpipe) +(defmacro play-desert () + `(start 'play (get-continue-by-name *game-info* "desert-start")) + ) + +(defmacro play-was () + `(start 'play (get-continue-by-name *game-info* "wascitya-start")) + ) + (defun play ((arg0 symbol) (arg1 symbol)) "Start (or restart) the game! This will start up the display process, and load the initial level." diff --git a/goal_src/jak3/engine/physics/cloth.gc b/goal_src/jak3/engine/physics/cloth.gc index c826529d78..5e15d1af31 100644 --- a/goal_src/jak3/engine/physics/cloth.gc +++ b/goal_src/jak3/engine/physics/cloth.gc @@ -11,6 +11,12 @@ (format 0 "unimplemented cloth-base-method-10~%") 0) +(defmethod cloth-system-method-34 ((this cloth-system)) + (format 0 "unimplemented cloth-system-method-34~%") + (none) + ) + + (defmethod init! ((this cloth-base)) ;; this looks more like run! than init to me. 0) \ No newline at end of file diff --git a/goal_src/jak3/engine/ui/minimap.gc b/goal_src/jak3/engine/ui/minimap.gc index 268d7a4376..691446e1ac 100644 --- a/goal_src/jak3/engine/ui/minimap.gc +++ b/goal_src/jak3/engine/ui/minimap.gc @@ -3499,8 +3499,9 @@ ;; og:preserve-this (let* ((a3-1 (the int (+ (* (the-as uint 320) (-> arg1 class icon-xy x)) 8))) (t0-1 (the int (+ (* (the-as uint 320) (-> arg1 class icon-xy y)) 8))) - (a1-65 (+ a3-1 312)) - (a2-14 (+ t0-1 312)) + ;; adjusted: + (a1-65 (+ a3-1 300)) + (a2-14 (+ t0-1 300)) ) (set! (-> (the-as (pointer uint128) v1-122) 0) (-> this sprite-tmpl dma-vif quad)) (set! (-> (the-as (pointer uint128) v1-122) 1) (-> this sprite-tmpl quad 1)) diff --git a/goal_src/jak3/game.gp b/goal_src/jak3/game.gp index a75712eb9e..a9f83a29e1 100644 --- a/goal_src/jak3/game.gp +++ b/goal_src/jak3/game.gp @@ -113,10 +113,10 @@ (cgo-file "wascast.gd" common-dep) (cgo-file "wasall.gd" common-dep) ; ;; arena -; (cgo-file "wasstada.gd" common-dep) -; (cgo-file "wasstadb.gd" common-dep) -; (cgo-file "wasstadc.gd" common-dep) -; (cgo-file "arenacst.gd" common-dep) +(cgo-file "wasstada.gd" common-dep) +(cgo-file "wasstadb.gd" common-dep) +(cgo-file "wasstadc.gd" common-dep) +(cgo-file "arenacst.gd" common-dep) ; ;; desert ; (cgo-file "desa.gd" common-dep) ; (cgo-file "desb.gd" common-dep) @@ -134,7 +134,7 @@ ; (cgo-file "desh.gd" common-dep) ; (cgo-file "deshover.gd" common-dep) ; (cgo-file "deshunt.gd" common-dep) -; (cgo-file "desinter.gd" common-dep) +(cgo-file "desinter.gd" common-dep) ; (cgo-file "desjump.gd" common-dep) ; (cgo-file "desliz.gd" common-dep) ; (cgo-file "desoasis.gd" common-dep)