Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

d/jak2: finish the majority of sparticle and sparticle-launcher #1840

Merged
merged 7 commits into from
Sep 5, 2022

Conversation

xTVaser
Copy link
Member

@xTVaser xTVaser commented Sep 3, 2022

The vast majority of the sparticle code remains the same (i wonder why lol) but there are a handful of new functions and effects in sparticle-launcher -- many of which ive left unfinished because they require essentially guesses at this point (they access arbitrary data). The rest of the functions we used mip2c for in jak 1, which I don't know how to use yet.

In some cases in sparticle it seems like we manually fixed the functions -- like memcpy? Perhaps these should also be mips2c'd this time around?

decompiler/config/jak1_ntsc_black_label.jsonc Outdated Show resolved Hide resolved
goal_src/jak2/engine/gfx/sprite/particles/sparticle-h.gc Outdated Show resolved Hide resolved
goal_src/jak2/engine/gfx/sprite/particles/sparticle-h.gc Outdated Show resolved Hide resolved
test/decompiler/reference/jak2/engine/anim/joint_REF.gc Outdated Show resolved Hide resolved
decompiler/util/DecompilerTypeSystem.cpp Outdated Show resolved Hide resolved
Copy link
Collaborator

@water111 water111 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, we're going to have to do a bunch of scratchpad/PC modifications/mips2c stuff.

I think we should wait until textures are working, so you can actually run this stuff and debug things. Let me know if you ware interested in working on this, I think it would be a good way to learn about mips2c stuff if you want.

(scalevelx float :offset 28)
(scalevely float :offset 44)
(friction float :offset-assert 96)
(timer int32 :offset-assert 100)
(flags sp-cpuinfo-flag :offset-assert 104) ;; guessed by decompiler
(flags sp-cpuinfo-flag :offset-assert 104) ;; NOTE - loaded with lw and lwu?
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably a sign that one of these is loaded from assembly (where they sometimes used the wrong load by accident, but it doesn't really matter)

@water111 water111 merged commit 80d0137 into open-goal:master Sep 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants