decomp3: spawn target, add merc and particle buckets and some temporary hacks
#3445
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
water111
reviewed
Apr 4, 2024
Comment on lines
-427
to
+428
| ASSERT_MSG(entry_index >= 0, "weird sprite_distort startup crash happened again!"); | ||
| // ASSERT_MSG(entry_index >= 0, "weird sprite_distort startup crash happened again!"); |
There was a problem hiding this comment.
do we need this change? maybe we just need to port the fix from jak 2?
goal_src/jak3/engine/gfx/sprite/particles/sparticle-launcher.gc
Outdated
Show resolved
Hide resolved
goal_src/jak3/engine/gfx/sprite/particles/sparticle-launcher.gc
Outdated
Show resolved
Hide resolved
goal_src/jak3/engine/gfx/sprite/particles/sparticle-launcher.gc
Outdated
Show resolved
Hide resolved
| (let ((v1-17 (sar v1-16 14))) | ||
| ;; og:preserve-this | ||
| (set! (-> arg2 r-g-b-a quad) (the-as uint128 (logior (logand (the-as uint t7-0) (the-as uint -2)) v1-17))) |
There was a problem hiding this comment.
actually - i think this relies on 64-bit ands leaving the upper 64 bits alone... maybe look at how we did this in jak 2? or fine to leave for now.
water111
approved these changes
Apr 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This includes all the collision stuff needed to spawn
target, decompiles the sparticle code and adds some of the PC hacks needed for merc to run (it doesn't work quite right and looks bad, likely due to a combination of code copied from Jak 2 and the time of day hacks).There are a bunch of temporary hacks (see commits) in place to prevent the game from crashing quite as much, but it is still extremely prone to doing so due to lots of missing functions/potentially bad decomp.