Decompile RIC func_8015F680 #838
Merged
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
sozud
reviewed
Dec 13, 2023
src/dra/86ECC.c
Outdated
| @@ -1411,15 +1411,15 @@ void func_8012D28C(bool exitEarly) { | |||
| // Start a routine where we look through this array for a value. | |||
| bitNotFound = 0; | |||
| for (i = 3; i < 7; i++) { | |||
| if ((g_Player.D_80072CF0[i][0] & 2)) { | |||
| if ((g_Player.colliders2[i].effects & 2)) { | |||
| return; | ||
| } | ||
| temp_s0 = | ||
| g_Player.unk04 & (EFFECT_UNK_8000 | EFFECT_UNK_4000 | EFFECT_UNK_0800 | |
There was a problem hiding this comment.
I don't have any real evidence that it's collider flags, but it seemed like a very similar bitmask to what was being used on the collider (ie, if it was g_Player.unk04 & 0x4021 I wouldn't have made this substitution) so I thought it was close enough to guess for now that it might be collider flags. Can revert to 0xCC03 if preferred.
There was a problem hiding this comment.
Given the context of the function I think it is safe to assume g_Player.unk04 is really related to the collision type mask. I'd vote to keep it as it is.
sozud
approved these changes
Dec 13, 2023
Xeeynamo
pushed a commit
that referenced
this pull request
Aug 30, 2024
As I've been saying on Discord, this is one of a set of functions that does a bunch of things with colliders. This required some slight restructuring of existing variables. We can finally confirm that the second array in g_Player is a set of colliders, so that's nice.
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.
As I've been saying on Discord, this is one of a set of functions that does a bunch of things with colliders.
This required some slight restructuring of existing variables. We can finally confirm that the second array in g_Player is a set of colliders, so that's nice.