diff --git a/decompiler/config/jak3/ntsc_v1/type_casts.jsonc b/decompiler/config/jak3/ntsc_v1/type_casts.jsonc index 17287af950..e41a36dd90 100644 --- a/decompiler/config/jak3/ntsc_v1/type_casts.jsonc +++ b/decompiler/config/jak3/ntsc_v1/type_casts.jsonc @@ -4309,7 +4309,7 @@ [6, "v1", "connection"], [9, "v1", "connection"], [10, "v1", "connection"], - [11, "t9", "(function object)"], + [11, "t9", "(function particle-local-space-info object)"], [15, "s5", "connection"], [[29, 34], "a1", "particle-local-space-info"] ], diff --git a/game/graphics/opengl_renderer/OpenGLRenderer.cpp b/game/graphics/opengl_renderer/OpenGLRenderer.cpp index 3a60d2a20c..d41cc49c4e 100644 --- a/game/graphics/opengl_renderer/OpenGLRenderer.cpp +++ b/game/graphics/opengl_renderer/OpenGLRenderer.cpp @@ -265,7 +265,7 @@ void OpenGLRenderer::init_bucket_renderers_jak3() { GET_BUCKET_ID_FOR_LIST(BucketId::MERC_L0_PRIS2, BucketId::MERC_L1_PRIS2, i), m_merc2); init_bucket_renderer( fmt::format("gmerc-l{}-pris2", i), BucketCategory::GENERIC, - GET_BUCKET_ID_FOR_LIST(BucketId::GMERC_L0_PRIS, BucketId::GMERC_L1_PRIS, i), m_generic2, + GET_BUCKET_ID_FOR_LIST(BucketId::GMERC_L0_PRIS2, BucketId::GMERC_L1_PRIS2, i), m_generic2, Generic2::Mode::NORMAL); } diff --git a/goal_src/jak3/engine/gfx/sprite/particles/sparticle-launcher.gc b/goal_src/jak3/engine/gfx/sprite/particles/sparticle-launcher.gc index 3cc536876a..5f9eecba3d 100644 --- a/goal_src/jak3/engine/gfx/sprite/particles/sparticle-launcher.gc +++ b/goal_src/jak3/engine/gfx/sprite/particles/sparticle-launcher.gc @@ -920,7 +920,11 @@ (s5-0 (-> (the-as connection v1-2) next0)) ) (while (!= v1-2 (-> gp-0 alive-list-end)) - ((the-as (function object) (-> (the-as connection v1-2) param0))) + (let ((a0-4 (the-as connection v1-2))) + ((the-as (function particle-local-space-info object) (-> (the-as connection v1-2) param0)) + (the-as particle-local-space-info a0-4) + ) + ) (set! v1-2 s5-0) (set! s5-0 (-> (the-as connection s5-0) next0)) ) diff --git a/test/decompiler/reference/jak3/engine/gfx/sprite/particles/sparticle-launcher_REF.gc b/test/decompiler/reference/jak3/engine/gfx/sprite/particles/sparticle-launcher_REF.gc index a68c8c5cbb..7dc9ddd429 100644 --- a/test/decompiler/reference/jak3/engine/gfx/sprite/particles/sparticle-launcher_REF.gc +++ b/test/decompiler/reference/jak3/engine/gfx/sprite/particles/sparticle-launcher_REF.gc @@ -1266,7 +1266,11 @@ (s5-0 (-> (the-as connection v1-2) next0)) ) (while (!= v1-2 (-> gp-0 alive-list-end)) - ((the-as (function object) (-> (the-as connection v1-2) param0))) + (let ((a0-4 (the-as connection v1-2))) + ((the-as (function particle-local-space-info object) (-> (the-as connection v1-2) param0)) + (the-as particle-local-space-info a0-4) + ) + ) (set! v1-2 s5-0) (set! s5-0 (-> (the-as connection s5-0) next0)) ) @@ -3215,3 +3219,7 @@ (none) ) ) + + + +